Fixed bug #46031 (Segfault in AppendIterator::next)

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index ce27ee7d7b88ee7d58368a1b3139d4b1815ebdd1..e6bfea84500dece3c4bb9a123622b319af17e9b9 100755 (executable)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1499,6 +1499,9 @@ static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
 
 static inline int spl_dual_it_valid(spl_dual_it_object *intern TSRMLS_DC)
 {
+       if (!intern->inner.iterator) {
+               return FAILURE;
+       }
        /* FAILURE / SUCCESS */
        return intern->inner.iterator->funcs->valid(intern->inner.iterator TSRMLS_CC);
 }

diff --git a/ext/spl/tests/bug46031.phpt b/ext/spl/tests/bug46031.phpt
new file mode 100644 (file)
index 0000000..9261ff0
--- /dev/null
+++ b/ext/spl/tests/bug46031.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Bug #46031 (Segfault in AppendIterator::next)
+--FILE--
+<?php
+$x = new AppendIterator();
+var_dump($x->next());
+?>
+--EXPECT--
+NULL