com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/reflection/php_reflection.c
| From: | Nikita Popov | Date: | Thu, 09 May 2019 10:35:11 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/reflection/php_reflection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106092@lists.php.net to get a copy of this message | ||
Commit: 90318fbcbed95e9f4469d697d47f76b9bd12e17f
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 9 May 2019 12:34:46 +0200
Parents: e46b3c3e70e299078ab3c2cf459cd90d1bac1acd 35c80583f08c0af3d01715cb8feeca6d0f284545
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=90318fbcbed95e9f4469d697d47f76b9bd12e17f
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM NEWS
MM ext/reflection/php_reflection.c
Diff:
diff --cc ext/reflection/php_reflection.c
index f30f47f,012f239..c381602
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -4205,12 -4247,25 +4193,24 @@@ ZEND_METHOD(reflection_class, getMethod
GET_REFLECTION_OBJECT_PTR(ce);
array_init(return_value);
- zend_hash_apply_with_arguments(&ce->function_table, (apply_func_args_t) _addmethod_va, 4,
&ce, return_value, filter, intern->obj);
- if (Z_TYPE(intern->obj) != IS_UNDEF && instanceof_function(ce, zend_ce_closure)) {
- zend_function *closure = zend_get_closure_invoke_method(Z_OBJ(intern->obj));
+ zend_hash_apply_with_arguments(&ce->function_table, (apply_func_args_t) _addmethod_va, 4,
&ce, return_value, filter);
+
+ if (instanceof_function(ce, zend_ce_closure)) {
+ zend_bool has_obj = Z_TYPE(intern->obj) != IS_UNDEF;
+ zval obj_tmp;
+ zend_object *obj;
+ if (!has_obj) {
+ object_init_ex(&obj_tmp, ce);
+ obj = Z_OBJ(obj_tmp);
+ } else {
+ obj = Z_OBJ(intern->obj);
+ }
+ zend_function *closure = zend_get_closure_invoke_method(obj);
if (closure) {
- _addmethod(closure, ce, return_value, filter, &intern->obj);
- _free_function(closure);
- _fix_closure_prototype(closure);
+ _addmethod(closure, ce, return_value, filter);
+ }
+ if (!has_obj) {
+ zval_ptr_dtor(&obj_tmp);
}
}
}