Merge branch 'true-async-api' into true-async

EdmondDantes · EdmondDantes · commit 063ca0cd4c86 · 2025-07-14T21:56:52.000+03:00
diff --git a/Zend/zend_async_API.c b/Zend/zend_async_API.c
@@ -668,6 +668,12 @@ ZEND_API void zend_async_resume_when(
 		zend_coroutine_event_callback_t *event_callback
 	)
 {
+	ZEND_ASSERT(EG(exception) == NULL && "Cannot resume when there is an active exception in the engine.");
+
+	if (UNEXPECTED(EG(exception))) {
+		return;
+	}
+
 	bool locally_allocated_callback = false;
 	
 	if (UNEXPECTED(ZEND_ASYNC_EVENT_IS_CLOSED(event))) {

Original file line number	Diff line number	Diff line change
`@@ -668,6 +668,12 @@ ZEND_API void zend_async_resume_when(`
`668`	`668`	`zend_coroutine_event_callback_t *event_callback`
`669`	`669`	`)`
`670`	`670`	`{`
	`671`	`+ ZEND_ASSERT(EG(exception) == NULL && "Cannot resume when there is an active exception in the engine.");`
	`672`	`+`
	`673`	`+ if (UNEXPECTED(EG(exception))) {`
	`674`	`+ return;`
	`675`	`+ }`
	`676`	`+`
`671`	`677`	`bool locally_allocated_callback = false;`
`672`	`678`
`673`	`679`	`if (UNEXPECTED(ZEND_ASYNC_EVENT_IS_CLOSED(event))) {`