com php-src: Partially revert 3477135cd1024c897dc070c37ddae411839b6e7e: Zend/zend_object_handlers.c
| From: | Dmitry Stogov | Date: | Thu, 15 Jan 2015 23:21:27 +0000 |
| Subject: | com php-src: Partially revert 3477135cd1024c897dc070c37ddae411839b6e7e: Zend/zend_object_handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84123@lists.php.net to get a copy of this message | ||
Commit: b46894d1048d4003f197af0f6de883b2930da89f
Author: Dmitry Stogov <dmitry@zend.com> Fri, 16 Jan 2015 02:21:27 +0300
Parents: 1c5e9146169cea55796749ff223e5670f2d509bd
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b46894d1048d4003f197af0f6de883b2930da89f
Log:
Partially revert 3477135cd1024c897dc070c37ddae411839b6e7e
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 251ac31..c77754f 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1044,7 +1044,9 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr,
zend_str
}
if (UNEXPECTED((func = zend_hash_find(&zobj->ce->function_table, lc_method_name)) ==
NULL)) {
- STR_ALLOCA_FREE(lc_method_name, use_heap);
+ if (UNEXPECTED(!key)) {
+ STR_ALLOCA_FREE(lc_method_name, use_heap);
+ }
if (zobj->ce->__call) {
return zend_get_user_call_function(zobj->ce, method_name);
} else {
@@ -1099,7 +1101,9 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr,
zend_str
}
}
- STR_ALLOCA_FREE(lc_method_name, use_heap);
+ if (UNEXPECTED(!key)) {
+ STR_ALLOCA_FREE(lc_method_name, use_heap);
+ }
return fbc;
}
/* }}} */