From: Felipe Pena <felipe@php.net>
Date: Tue, 22 Mar 2011 22:41:16 +0000 (+0000)
Subject: - Fixed bug #54281 (Crash in non-initialized RecursiveIteratorIterator)
X-Git-Tag: php-5.4.0alpha1~191^2~123
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11c4a5b96a2adea39774f8089071e9226409057f;p=php

- Fixed bug #54281 (Crash in non-initialized RecursiveIteratorIterator)
---

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index cabf9f55f3..1766d2a426 100755
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -360,6 +360,10 @@ next_step:
 static void spl_recursive_it_rewind_ex(spl_recursive_it_object *object, zval *zthis TSRMLS_DC)
 {
 	zend_object_iterator      *sub_iter;
+	
+	if (!object->iterators) {
+		php_error_docref(NULL TSRMLS_CC, E_ERROR, "The %s instance wasn't initialized properly", Z_OBJCE_P(zthis)->name);
+	}
 
 	while (object->level) {
 		sub_iter = object->iterators[object->level].iterator;
diff --git a/ext/spl/tests/bug54281.phpt b/ext/spl/tests/bug54281.phpt
new file mode 100644
index 0000000000..d42d9e585d
--- /dev/null
+++ b/ext/spl/tests/bug54281.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #54281 (Crash in spl_recursive_it_rewind_ex)
+--FILE--
+<?php
+
+class RecursiveArrayIteratorIterator extends RecursiveIteratorIterator {
+	function __construct($it, $max_depth) { }
+}
+$it = new RecursiveArrayIteratorIterator(new RecursiveArrayIterator(array()), 2);
+
+foreach($it as $k=>$v) { }
+
+?>
+--EXPECTF--
+Fatal error: RecursiveIteratorIterator::rewind(): The RecursiveArrayIteratorIterator instance wasn't initialized properly in %s on line %d