From: Xinchen Hui <laruence@php.net>
Date: Sat, 21 Jul 2012 15:26:18 +0000 (+0800)
Subject: Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segment... 
X-Git-Tag: php-5.3.16~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc30524c89fa2255944dc3c70f8d41a6c23faa2a;p=php

Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
---

diff --git a/NEWS b/NEWS
index 902185cffe..e6b51a9140 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ PHP                                                                        NEWS
 - DateTime:
   . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
 
+- SPL:
+  . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
+    gives Segmentation fault). (Laruence, Gustavo)
+
 14 Jun 2012, PHP 5.3.14
 
 - CLI SAPI:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index eecd483ba7..a46b7d4e48 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1287,6 +1287,8 @@ static union _zend_function *spl_dual_it_get_method(zval **object_ptr, char *met
 				*object_ptr = intern->inner.zobject;
 				function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len TSRMLS_CC);
 			}
+		} else {
+			*object_ptr = intern->inner.zobject;
 		}
 	}
 	return function_handler;