com php-src: Fixed support for references: Zend/zend_API.c
| From: | Dmitry Stogov | Date: | Fri, 07 Mar 2014 07:32:07 +0000 |
| Subject: | com php-src: Fixed support for references: Zend/zend_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77692@lists.php.net to get a copy of this message | ||
Commit: 81531116c141612c26c1ff529104678398def310
Author: Dmitry Stogov <dmitry@zend.com> Fri, 7 Mar 2014 11:32:07 +0400
Parents: 7003e765126855737f3527142a82d9b9ce34e11a
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=81531116c141612c26c1ff529104678398def310
Log:
Fixed support for references
Changed paths:
M Zend/zend_API.c
Diff:
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 8372e10..7e47ebd 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3155,7 +3155,13 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint
ch
if (zend_hash_num_elements(Z_ARRVAL_P(callable)) == 2) {
obj = zend_hash_index_find(Z_ARRVAL_P(callable), 0);
+ if (Z_TYPE_P(obj) == IS_REFERENCE) {
+ obj = Z_REFVAL_P(obj);
+ }
method = zend_hash_index_find(Z_ARRVAL_P(callable), 1);
+ if (Z_TYPE_P(method) == IS_REFERENCE) {
+ method = Z_REFVAL_P(method);
+ }
}
if (obj && method &&
(Z_TYPE_P(obj) == IS_OBJECT ||