com php-src: Fixed spl_dual_it_get_method: ext/spl/ spl_iterators.c
| From: | Dmitry Stogov | Date: | Sun, 16 Mar 2014 15:02:14 +0000 |
| Subject: | com php-src: Fixed spl_dual_it_get_method: ext/spl/ spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77630@lists.php.net to get a copy of this message | ||
Commit: 86aa343d3b74c48ea65d26ed02f23cdfa4044308
Author: Xinchen Hui <laruence@gmail.com> Sun, 16 Mar 2014 23:02:14 +0800
Parents: b78bbe93ca8531194de8c9378b711ba1373ea8b2
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86aa343d3b74c48ea65d26ed02f23cdfa4044308
Log:
Fixed spl_dual_it_get_method
Changed paths:
M ext/spl/spl_iterators.c
Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 622ff72..79a99d4 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1286,13 +1286,11 @@ static union _zend_function *spl_dual_it_get_method(zval *object_ptr,
zend_strin
if (!function_handler && intern->inner.ce) {
if ((function_handler = zend_hash_find_ptr(&intern->inner.ce->function_table, method))
== NULL) {
if (Z_OBJ_HT(intern->inner.zobject)->get_method) {
- //!!! maybe we really need a zval ** here?
- //*object_ptr = &intern->inner.zobject?
- object_ptr = &intern->inner.zobject;
+ ZVAL_COPY_VALUE(object_ptr, &intern->inner.zobject);
function_handler = Z_OBJ_HT_P(object_ptr)->get_method(object_ptr, method, key TSRMLS_CC);
}
} else {
- object_ptr = &intern->inner.zobject;
+ ZVAL_COPY_VALUE(object_ptr, &intern->inner.zobject);
}
}
return function_handler;