Check current_execute_data instead of flags in fiber destructor

trowski · trowski · commit 8681cd3d2b82 · 2021-05-05T14:16:39.000-05:00
Checking EG(current_exectue_data) throws into the previous fiber instead of triggering a fatal error during shutdown. A fatal error is triggered only if the throwing destroyed fiber was resumed from {main}.
diff --git a/src/fiber.c b/src/fiber.c
@@ -240,7 +240,7 @@ static void zend_fiber_object_destroy(zend_object *object)
 
 		zend_exception_set_previous(EG(exception), exception);
 
-		if (EG(flags) & EG_FLAGS_IN_SHUTDOWN) {
+		if (!EG(current_execute_data)) {
 			zend_exception_error(EG(exception), E_ERROR);
 		}
 	} else {
diff --git a/tests/throw-in-multiple-destroyed-fibers-after-shutdown.phpt b/tests/throw-in-multiple-destroyed-fibers-after-shutdown.phpt
@@ -0,0 +1,67 @@
+--TEST--
+Throw in multiple destroyed fibers after shutdown
+--EXTENSIONS--
+fiber
+--FILE--
+<?php
+
+$fiber = new Fiber(function (): void {
+    $fiber1 = new Fiber(function (): void {
+        try {
+            Fiber::suspend();
+        } finally {
+            throw new Exception('test1');
+        }
+    });
+
+    $fiber1->start();
+
+    $fiber2 = new Fiber(function (): void {
+        try {
+            Fiber::suspend();
+        } finally {
+            throw new Exception('test2');
+        }
+    });
+
+    $fiber2->start();
+
+    Fiber::suspend();
+});
+
+$fiber->start();
+
+echo "done\n";
+
+?>
+--EXPECTF--
+done
+
+Fatal error: Uncaught FiberExit: Fiber destroyed in %sthrow-in-multiple-destroyed-fibers-after-shutdown.php:%d
+Stack trace:
+#0 %sthrow-in-multiple-destroyed-fibers-after-shutdown.php(%d): Fiber::suspend()
+#1 [internal function]: {closure}()
+#2 {main}
+
+Next FiberExit: Fiber destroyed in %sthrow-in-multiple-destroyed-fibers-after-shutdown.php:%d
+Stack trace:
+#0 %sthrow-in-multiple-destroyed-fibers-after-shutdown.php(%d): Fiber::suspend()
+#1 [internal function]: {closure}()
+#2 {main}
+
+Next Exception: test1 in %sthrow-in-multiple-destroyed-fibers-after-shutdown.php:%d
+Stack trace:
+#0 [internal function]: {closure}()
+#1 {main}
+
+Next FiberExit: Fiber destroyed in %sthrow-in-multiple-destroyed-fibers-after-shutdown.php:%d
+Stack trace:
+#0 %sthrow-in-multiple-destroyed-fibers-after-shutdown.php(%d): Fiber::suspend()
+#1 [internal function]: {closure}()
+#2 {main}
+
+Next Exception: test2 in %sthrow-in-multiple-destroyed-fibers-after-shutdown.php:%d
+Stack trace:
+#0 [internal function]: {closure}()
+#1 {main}
+  thrown in %sthrow-in-multiple-destroyed-fibers-after-shutdown.php on line %d

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ static void zend_fiber_object_destroy(zend_object *object)`
`240`	`240`
`241`	`241`	`zend_exception_set_previous(EG(exception), exception);`
`242`	`242`
`243`		`- if (EG(flags) & EG_FLAGS_IN_SHUTDOWN) {`
	`243`	`+ if (!EG(current_execute_data)) {`
`244`	`244`	`zend_exception_error(EG(exception), E_ERROR);`
`245`	`245`	`}`
`246`	`246`	`} else {`