Fixed bug #72684 (AppendIterator segfault with closed generator)

dereckson · Jul 27, 2016 · 4c2e1a1 · 4c2e1a1
1 parent 24d8f6e
commit 4c2e1a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -1688,7 +1688,7 @@ static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
 {
 	spl_dual_it_free(intern TSRMLS_CC);
 	intern->current.pos = 0;
-	if (intern->inner.iterator->funcs->rewind) {
+	if (intern->inner.iterator && intern->inner.iterator->funcs->rewind) {
 		intern->inner.iterator->funcs->rewind(intern->inner.iterator TSRMLS_CC);
 	}
 }

diff --git a/ext/spl/tests/bug72684.phpt b/ext/spl/tests/bug72684.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #72684 (AppendIterator segfault with closed generator)
+--FILE--
+<?php
+
+function createGenerator() { yield 1; }
+$generator = createGenerator();
+
+$appendIterator = new AppendIterator();
+$appendIterator->append($generator);
+
+iterator_to_array($appendIterator);
+try {
+	iterator_to_array($appendIterator);
+} catch (\Exception $e) {
+	echo $e->getMessage();
+}
+
+?>
+--EXPECT--
+Cannot traverse an already closed generator