* Fixed an issue with incorrect cleanup of coroutine interceptor handler state.

Author: EdmondDantes

Zend/zend_async_API.c

@@ -1283,6 +1283,13 @@ ZEND_API uint32_t zend_coroutine_add_switch_handler(
 		return 0;
 	}
 
+	/* Check for duplicate handler */
+	for (uint32_t i = 0; i < vector->length; i++) {
+		if (vector->data[i].handler == handler) {
+			return i;
+		}
+	}
+	
 	/* Expand array if needed */
 	if (vector->length == vector->capacity) {
 		vector->capacity = vector->capacity ? vector->capacity * 2 : 4;
@@ -1384,6 +1391,13 @@ ZEND_API void zend_async_add_main_coroutine_start_handler(
 {
 	zend_coroutine_switch_handlers_vector_t *vector = &global_main_coroutine_start_handlers;
 
+	/* Check for duplicate handler */
+	for (uint32_t i = 0; i < vector->length; i++) {
+		if (vector->data[i].handler == handler) {
+			return;
+		}
+	}
+
 	/* Expand vector if needed */
 	if (vector->length >= vector->capacity) {
 		uint32_t new_capacity = vector->capacity ? vector->capacity * 2 : 4;

Zend/zend_async_API.h

@@ -1423,5 +1423,11 @@ END_EXTERN_C()
 
 /* Global Main Coroutine Switch Handlers API Macros */
 #define ZEND_ASYNC_ADD_MAIN_COROUTINE_START_HANDLER(handler) zend_async_add_main_coroutine_start_handler(handler)
+#define ZEND_ASYNC_ADD_SWITCH_HANDLER(handler) \
+	if (ZEND_ASYNC_CURRENT_COROUTINE) { \
+		zend_coroutine_add_switch_handler(ZEND_ASYNC_CURRENT_COROUTINE, handler); \
+	} else { \
+		zend_async_add_main_coroutine_start_handler(handler); \
+	}
 
 #endif //ZEND_ASYNC_API_H

Zend/zend_execute_API.c

@@ -285,6 +285,7 @@ static void  shutdown_destructors_coroutine_dtor(zend_coroutine_t *coroutine)
 
 	if (shutdown_context->coroutine == coroutine) {
 		shutdown_context->coroutine = NULL;
+		shutdown_context->is_started = false;
 		zend_error(E_CORE_ERROR, "Shutdown destructors coroutine was not finished property");
 		EG(symbol_table).pDestructor = zend_unclean_zval_ptr_dtor;
 		shutdown_destructors();
@@ -304,6 +305,12 @@ static bool shutdown_destructors_context_switch_handler(
 		return false;
 	}
 
+	zend_shutdown_context_t *shutdown_context = &EG(shutdown_context);
+
+	if (false == shutdown_context->is_started) {
+		return false;
+	}
+
 	zend_coroutine_t *shutdown_coroutine = ZEND_ASYNC_SPAWN_WITH_SCOPE_EX(ZEND_ASYNC_MAIN_SCOPE, 1);
 	shutdown_coroutine->internal_entry = shutdown_destructors_async;
 	shutdown_coroutine->extended_dispose = shutdown_destructors_coroutine_dtor;
@@ -385,9 +392,12 @@ void shutdown_destructors_async(void) /* {{{ */
 		}
 	} zend_catch {
 		EG(symbol_table).pDestructor = zend_unclean_zval_ptr_dtor;
+		shutdown_context->is_started = false;
 		shutdown_destructors();
 		zend_bailout();
 	} zend_end_try();
+
+	shutdown_context->is_started = false;
 }
 /* }}} */
 #endif

Zend/zend_objects_API.c

@@ -72,6 +72,7 @@ static void  store_call_destructors_coroutine_dtor(zend_coroutine_t *coroutine)
 
 	if (shutdown_context->coroutine == coroutine) {
 		shutdown_context->coroutine = NULL;
+		shutdown_context->is_started = false;
 		zend_error(E_CORE_ERROR, "Shutdown destructors coroutine was not finished property");
 		shutdown_destructors();
 	}
@@ -95,6 +96,12 @@ static bool store_call_destructors_context_switch_handler(
 		return false;
 	}
 
+	zend_shutdown_context_t *shutdown_context = &EG(shutdown_context);
+
+	if (false == shutdown_context->is_started) {
+		return false;
+	}
+
 	zend_coroutine_t *shutdown_coroutine = ZEND_ASYNC_SPAWN_WITH_SCOPE_EX(ZEND_ASYNC_MAIN_SCOPE, 1);
 	shutdown_coroutine->internal_entry = store_call_destructors_entry;
 	shutdown_coroutine->extended_dispose = store_call_destructors_coroutine_dtor;