|
 |
e3a6b0 |
From df2db7fceaff4f46909f1aa8b31f0a9010631fc9 Mon Sep 17 00:00:00 2001
|
|
|
e3a6b0 |
From: Nikita Popov <nikita.ppv@gmail.com>
|
|
|
e3a6b0 |
Date: Mon, 8 Jun 2020 11:31:28 +0200
|
|
|
e3a6b0 |
Subject: [PATCH] Fixed bug #79657
|
|
|
e3a6b0 |
|
|
|
e3a6b0 |
Throwing an exception should count as an initialization for this
|
|
|
e3a6b0 |
purpose.
|
|
|
e3a6b0 |
---
|
|
|
e3a6b0 |
NEWS | 2 ++
|
|
|
e3a6b0 |
Zend/tests/bug79657.phpt | 42 ++++++++++++++++++++++++++++++++++++++++
|
|
|
e3a6b0 |
Zend/zend_generators.c | 1 +
|
|
|
e3a6b0 |
3 files changed, 45 insertions(+)
|
|
|
e3a6b0 |
create mode 100644 Zend/tests/bug79657.phpt
|
|
|
e3a6b0 |
|
|
|
e3a6b0 |
diff --git a/Zend/tests/bug79657.phpt b/Zend/tests/bug79657.phpt
|
|
|
e3a6b0 |
new file mode 100644
|
|
|
e3a6b0 |
index 000000000000..fb2ccab3e3ef
|
|
|
e3a6b0 |
--- /dev/null
|
|
|
e3a6b0 |
+++ b/Zend/tests/bug79657.phpt
|
|
|
e3a6b0 |
@@ -0,0 +1,42 @@
|
|
|
e3a6b0 |
+--TEST--
|
|
|
e3a6b0 |
+Bug #79657: "yield from" hangs when invalid value encountered
|
|
|
e3a6b0 |
+--FILE--
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+function throwException(): iterable
|
|
|
e3a6b0 |
+{
|
|
|
e3a6b0 |
+ throw new Exception();
|
|
|
e3a6b0 |
+}
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+function loop(): iterable
|
|
|
e3a6b0 |
+{
|
|
|
e3a6b0 |
+ $callbacks = [
|
|
|
e3a6b0 |
+ function () {
|
|
|
e3a6b0 |
+ yield 'first';
|
|
|
e3a6b0 |
+ },
|
|
|
e3a6b0 |
+ function () {
|
|
|
e3a6b0 |
+ yield from throwException();
|
|
|
e3a6b0 |
+ }
|
|
|
e3a6b0 |
+ ];
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+ foreach ($callbacks as $callback) {
|
|
|
e3a6b0 |
+ yield from $callback();
|
|
|
e3a6b0 |
+ }
|
|
|
e3a6b0 |
+}
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+function get(string $first, int $second): array
|
|
|
e3a6b0 |
+{
|
|
|
e3a6b0 |
+ return [];
|
|
|
e3a6b0 |
+}
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+get(...loop());
|
|
|
e3a6b0 |
+
|
|
|
e3a6b0 |
+?>
|
|
|
e3a6b0 |
+--EXPECTF--
|
|
|
e3a6b0 |
+Fatal error: Uncaught Exception in %s:%d
|
|
|
e3a6b0 |
+Stack trace:
|
|
|
e3a6b0 |
+#0 %s(%d): throwException()
|
|
|
e3a6b0 |
+#1 %s(%d): {closure}()
|
|
|
e3a6b0 |
+#2 %s(%d): loop()
|
|
|
e3a6b0 |
+#3 {main}
|
|
|
e3a6b0 |
+ thrown in %s on line %d
|
|
|
e3a6b0 |
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
|
|
|
e3a6b0 |
index 4cd9087303a3..15bbfca1c58a 100644
|
|
|
e3a6b0 |
--- a/Zend/zend_generators.c
|
|
|
e3a6b0 |
+++ b/Zend/zend_generators.c
|
|
|
e3a6b0 |
@@ -857,6 +857,7 @@ ZEND_API void zend_generator_resume(zend_generator *orig_generator) /* {{{ */
|
|
|
e3a6b0 |
} else {
|
|
|
e3a6b0 |
generator = zend_generator_get_current(orig_generator);
|
|
|
e3a6b0 |
zend_generator_throw_exception(generator, NULL);
|
|
|
e3a6b0 |
+ orig_generator->flags &= ~ZEND_GENERATOR_DO_INIT;
|
|
|
e3a6b0 |
goto try_again;
|
|
|
e3a6b0 |
}
|
|
|
e3a6b0 |
}
|