Merge branch 'PHP-7.4'

dstogov · dstogov · commit aacea14359e6 · 2019-10-23T19:54:52.000+03:00
* PHP-7.4:
  Ignore ZEND_FFI_TYPE_OWNED flag
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -925,7 +925,7 @@ static void zend_ffi_create_callback(zend_ffi_type type, zval value) / {{{ *`
`925`	`925`	`n++;`
`926`	`926`	`} ZEND_HASH_FOREACH_END();`
`927`	`927`	`}`
`928`		`- callback_data->ret_type = zend_ffi_get_type(type->func.ret_type);`
	`928`	`+ callback_data->ret_type = zend_ffi_get_type(ZEND_FFI_TYPE(type->func.ret_type));`
`929`	`929`	`if (!callback_data->ret_type) {`
`930`	`930`	`zend_ffi_return_unsupported(type->func.ret_type);`
`931`	`931`	`efree(callback_data);`