* fix async_coroutine_execute:: bailout handler

EdmondDantes · EdmondDantes · commit 3dccf0a8d617 · 2025-12-22T13:52:21.000+02:00
diff --git a/coroutine.c b/coroutine.c
@@ -415,6 +415,7 @@ ZEND_STACK_ALIGNED void async_coroutine_execute(async_coroutine_t *coroutine)
 			}
 			zend_catch
 			{
+				is_bailout = true;
 				should_start_graceful_shutdown = true;
 			}
 			zend_end_try();
@@ -426,7 +427,7 @@ ZEND_STACK_ALIGNED void async_coroutine_execute(async_coroutine_t *coroutine)
 			ZEND_ASYNC_CURRENT_COROUTINE = NULL;
 		}
 
-		return;
+		goto exit;
 	}
 
 	if (UNEXPECTED(waker->status == ZEND_ASYNC_WAKER_WAITING)) {
@@ -492,6 +493,8 @@ ZEND_STACK_ALIGNED void async_coroutine_execute(async_coroutine_t *coroutine)
 		ZEND_ASYNC_CURRENT_COROUTINE = NULL;
 	}
 
+exit:
+
 	if (UNEXPECTED(should_start_graceful_shutdown)) {
 		zend_try
 		{

Original file line number	Diff line number	Diff line change
`@@ -415,6 +415,7 @@ ZEND_STACK_ALIGNED void async_coroutine_execute(async_coroutine_t *coroutine)`
`415`	`415`	`}`
`416`	`416`	`zend_catch`
`417`	`417`	`{`
	`418`	`+ is_bailout = true;`
`418`	`419`	`should_start_graceful_shutdown = true;`
`419`	`420`	`}`
`420`	`421`	`zend_end_try();`
`@@ -426,7 +427,7 @@ ZEND_STACK_ALIGNED void async_coroutine_execute(async_coroutine_t *coroutine)`
`426`	`427`	`ZEND_ASYNC_CURRENT_COROUTINE = NULL;`
`427`	`428`	`}`
`428`	`429`
`429`		`- return;`
	`430`	`+ goto exit;`
`430`	`431`	`}`
`431`	`432`
`432`	`433`	`if (UNEXPECTED(waker->status == ZEND_ASYNC_WAKER_WAITING)) {`
`@@ -492,6 +493,8 @@ ZEND_STACK_ALIGNED void async_coroutine_execute(async_coroutine_t *coroutine)`
`492`	`493`	`ZEND_ASYNC_CURRENT_COROUTINE = NULL;`
`493`	`494`	`}`
`494`	`495`
	`496`	`+exit:`
	`497`	`+`
`495`	`498`	`if (UNEXPECTED(should_start_graceful_shutdown)) {`
`496`	`499`	`zend_try`
`497`	`500`	`{`