com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/reflectio n/php_reflection.c
| From: | Nikita Popov | Date: | Thu, 09 May 2019 10:36:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/reflectio n/php_reflection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106094@lists.php.net to get a copy of this message | ||
Commit: 4b40a46bf157c2e26714dffdf6c78b2bb85f24ab
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 9 May 2019 12:36:20 +0200
Parents: 9840a1111712846cfdc81d3029719a02196deb29 90318fbcbed95e9f4469d697d47f76b9bd12e17f
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4b40a46bf157c2e26714dffdf6c78b2bb85f24ab
Log:
Merge branch 'PHP-7.3' into PHP-7.4
Changed paths:
MM ext/reflection/php_reflection.c
Diff:
diff --cc ext/reflection/php_reflection.c
index da459e6,c381602..f1037ef
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@@ -4137,15 -4193,24 +4128,26 @@@ 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);
+ ZEND_HASH_FOREACH_PTR(&ce->function_table, mptr) {
- _addmethod(mptr, ce, return_value, filter, &intern->obj);
++ _addmethod(mptr, ce, return_value, filter);
+ } ZEND_HASH_FOREACH_END();
- 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));
+ 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);
+ _addmethod(closure, ce, return_value, filter);
+ }
+ if (!has_obj) {
+ zval_ptr_dtor(&obj_tmp);
}
}
}