diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-09-10 11:02:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-09-10 11:02:03 +0300 |
| commit | d40d0faa90a00e937d3baeba9dea1d15a0c8c25c (patch) | |
| tree | 58723ddb974fcc7d17f39a0416cd7653400b07f1 | |
| parent | 396be33ca568757c9c54168b95bb2081e4037c24 (diff) | |
| parent | ea92b9b655aea61ae7e2862ac527de3a03a024a4 (diff) | |
| download | php-git-d40d0faa90a00e937d3baeba9dea1d15a0c8c25c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Stop after exceptions
| -rw-r--r-- | ext/ffi/ffi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index c7124f5127..765b63181e 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -3794,6 +3794,7 @@ ZEND_METHOD(FFI, cast) /* {{{ */ RETURN_OBJ(&cdata->std); } else { zend_wrong_parameter_class_error(2, "FFI\\CData", zv); + return; } } @@ -4037,6 +4038,7 @@ ZEND_METHOD(FFI, addr) /* {{{ */ ZVAL_DEREF(zv); if (Z_TYPE_P(zv) != IS_OBJECT || Z_OBJCE_P(zv) != zend_ffi_cdata_ce) { zend_wrong_parameter_class_error(1, "FFI\\CData", zv); + return; } cdata = (zend_ffi_cdata*)Z_OBJ_P(zv); |