diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-10-23 19:54:52 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-10-23 19:54:52 +0300 |
| commit | aacea14359e6f75a2ae698285392ba4af71a12f1 (patch) | |
| tree | 37bda9f6c4546f1b09f8c2b30aeeadaccc7b89ef | |
| parent | 62fcb11cbd2da13496509bd136c7618289353fcd (diff) | |
| parent | c744531fff9ee03c027ca3c18b21f3382023ff7e (diff) | |
| download | php-git-aacea14359e6f75a2ae698285392ba4af71a12f1.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Ignore ZEND_FFI_TYPE_OWNED flag
| -rw-r--r-- | ext/ffi/ffi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index e81554e703..9c83cd4f6a 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -925,7 +925,7 @@ static void *zend_ffi_create_callback(zend_ffi_type *type, zval *value) /* {{{ * n++; } ZEND_HASH_FOREACH_END(); } - callback_data->ret_type = zend_ffi_get_type(type->func.ret_type); + callback_data->ret_type = zend_ffi_get_type(ZEND_FFI_TYPE(type->func.ret_type)); if (!callback_data->ret_type) { zend_ffi_return_unsupported(type->func.ret_type); efree(callback_data); |