diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2012-08-08 16:48:43 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2012-08-08 16:48:43 +0200 |
| commit | aa5d8db01989776315c05c52343b609d01dcc43a (patch) | |
| tree | 090c6ca595cf6b9fc3b00198f286c16d934e544c /libffi | |
| parent | 6b4a85ad6f41a0f2f1a10917dc3b9366c9a5c051 (diff) | |
ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, just return FFI_BAD_ABI when things are wrong.
* src/s390/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test,
just return FFI_BAD_ABI when things are wrong.
From-SVN: r190230
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | libffi/src/s390/ffi.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 00b7a74219a..f66a84927e8 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2012-08-08 Uros Bizjak <ubizjak@gmail.com> + + * src/s390/ffi.c (ffi_prep_closure_loc): Don't ASSERT ABI test, + just return FFI_BAD_ABI when things are wrong. + 2012-07-18 H.J. Lu <hongjiu.lu@intel.com> PR libffi/53982 diff --git a/libffi/src/s390/ffi.c b/libffi/src/s390/ffi.c index ca2675bc89d..8adb5bc0ba3 100644 --- a/libffi/src/s390/ffi.c +++ b/libffi/src/s390/ffi.c @@ -750,7 +750,8 @@ ffi_prep_closure_loc (ffi_closure *closure, void *user_data, void *codeloc) { - FFI_ASSERT (cif->abi == FFI_SYSV); + if (cif->abi != FFI_SYSV) + return FFI_BAD_ABI; #ifndef __s390x__ *(short *)&closure->tramp [0] = 0x0d10; /* basr %r1,0 */ |