From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 16 Mar 2014 15:02:14 +0000 (+0800)
Subject: Fixed spl_dual_it_get_method
X-Git-Tag: POST_PHPNG_MERGE~412^2~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86aa343d3b74c48ea65d26ed02f23cdfa4044308;p=php

Fixed spl_dual_it_get_method
---

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 622ff726db..79a99d4097 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;