Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segment...

diff --git a/NEWS b/NEWS
index 902185cffe97b83f51a669a82ef91545eed3f580..e6b51a91403157338e8ae7d05cddf1d90fe5c65a 100644 (file)
--- 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 eecd483ba77d099d6371c3ef41027aa985d05818..a46b7d4e48d4b3df606606413dfeb05a681dd580 100755 (executable)
--- 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;