Fixed bug #79657

Throwing an exception should count as an initialization for this
purpose.

diff --git a/NEWS b/NEWS
index 2803497eee83f5621c55332ed8d68f79624449ae..d07f1f5ee51bc0ad19f6a8423d6e27766da50d80 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
   . Fixed bug #79650 (php-win.exe 100% cpu lockup). (cmb)
   . Fixed bug #79668 (get_defined_functions(true) may miss functions). (cmb,
     Nikita)
+  . Fixed bug #79657 ("yield from" hangs when invalid value encountered).
+    (Nikita)
 
 - Filter:
   . Fixed bug #73527 (Invalid memory access in php_filter_strip). (cmb)

diff --git a/Zend/tests/bug79657.phpt b/Zend/tests/bug79657.phpt
new file mode 100644 (file)
index 0000000..fb2ccab
--- /dev/null
+++ b/Zend/tests/bug79657.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Bug #79657: "yield from" hangs when invalid value encountered
+--FILE--
+<?php
+
+function throwException(): iterable
+{
+    throw new Exception();
+}
+
+function loop(): iterable
+{
+    $callbacks = [
+        function () {
+            yield 'first';
+        },
+        function () {
+            yield from throwException();
+        }
+    ];
+
+    foreach ($callbacks as $callback) {
+        yield from $callback();
+    }
+}
+
+function get(string $first, int $second): array
+{
+    return [];
+}
+
+get(...loop());
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Exception in %s:%d
+Stack trace:
+#0 %s(%d): throwException()
+#1 %s(%d): {closure}()
+#2 %s(%d): loop()
+#3 {main}
+  thrown in %s on line %d

diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 4cd9087303a3ff42a237b79bf57378578534983b..15bbfca1c58a5b84d9b01389e37cce245b91d1a7 100644 (file)
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -857,6 +857,7 @@ try_again:
                        } else {
                                generator = zend_generator_get_current(orig_generator);
                                zend_generator_throw_exception(generator, NULL);
+                               orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
                                goto try_again;
                        }
                }