com php-src: Forgot fix similar issue in spl_recursive_it _get_method: ext/spl/spl_iterators.c
| From: | Dmitry Stogov | Date: | Sun, 16 Mar 2014 15:04:07 +0000 |
| Subject: | com php-src: Forgot fix similar issue in spl_recursive_it _get_method: ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77629@lists.php.net to get a copy of this message | ||
Commit: 639c4da20aa26f646d55b5a21f1a67ca7ef1dba1
Author: Xinchen Hui <laruence@gmail.com> Sun, 16 Mar 2014 23:04:07 +0800
Parents: 86aa343d3b74c48ea65d26ed02f23cdfa4044308
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=639c4da20aa26f646d55b5a21f1a67ca7ef1dba1
Log:
Forgot fix similar issue in spl_recursive_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 79a99d4..55587c4 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -845,7 +845,7 @@ static union _zend_function *spl_recursive_it_get_method(zval *object_ptr, zend_
if (!function_handler) {
if ((function_handler = zend_hash_find_ptr(&Z_OBJCE_P(zobj)->function_table, method)) ==
NULL) {
if (Z_OBJ_HT_P(zobj)->get_method) {
- *object_ptr = *zobj;
+ ZVAL_COPY_VALUE(object_ptr, zobj);
function_handler = Z_OBJ_HT_P(object_ptr)->get_method(object_ptr, method, key TSRMLS_CC);
}
}