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

laruence · laruence · commit cc30524c89fa · 2012-07-21T23:26:18.000+08:00
diff --git 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1287,6 +1287,8 @@ static union _zend_function spl_dual_it_get_method(zval object_ptr, char met`
`1287`	`1287`	`*object_ptr = intern->inner.zobject;`
`1288`	`1288`	`function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len TSRMLS_CC);`
`1289`	`1289`	`}`
	`1290`	`+ } else {`
	`1291`	`+ *object_ptr = intern->inner.zobject;`
`1290`	`1292`	`}`
`1291`	`1293`	`}`
`1292`	`1294`	`return function_handler;`