#9: * Fixed a memory leak issue in Scope + onFinally.

Author: EdmondDantes

coroutine.c

@@ -409,10 +409,10 @@ static void finally_handlers_iterator_dtor(zend_async_iterator_t *zend_iterator)
 	efree(context);
 	iterator->extended_data = NULL;
 
-	if (ZEND_ASYNC_EVENT_REF(&scope->scope.event) > 1) {
+	if (ZEND_ASYNC_EVENT_REF(&scope->scope.event) > 0) {
 		ZEND_ASYNC_EVENT_DEL_REF(&scope->scope.event);
 
-		if (ZEND_ASYNC_EVENT_REF(&scope->scope.event) == 1) {
+		if (ZEND_ASYNC_EVENT_REF(&scope->scope.event) <= 1) {
 			scope->scope.try_to_dispose(&scope->scope);
 		}
 	}
@@ -464,7 +464,14 @@ bool async_call_finally_handlers(HashTable *finally_handlers, finally_handlers_c
 	iterator->extended_data = context;
 	iterator->extended_dtor = finally_handlers_iterator_dtor;
 	async_iterator_run_in_coroutine(iterator, priority);
-	ZEND_ASYNC_EVENT_ADD_REF(&child_scope->event);
+
+	//
+	// We retain ownership of the Scope in order to be able to handle exceptions from the Finally handlers.
+	// example: finally_handlers_iterator_dtor
+	// If the onFinally handlers throw an exception, it will end up in the Scope,
+	// so it’s important that the Scope is not destroyed before that moment.
+	//
+	ZEND_ASYNC_EVENT_ADD_REF(&context->scope->event);
 
 	if (UNEXPECTED(EG(exception))) {
 		return false;

scope.c

@@ -990,26 +990,29 @@ static bool scope_try_to_dispose(zend_async_scope_t *scope)
 {
 	async_scope_t *async_scope = (async_scope_t *) scope;
 
-	if (ZEND_ASYNC_SCOPE_IS_DISPOSED(scope)) {
+	if (ZEND_ASYNC_SCOPE_IS_DISPOSING(scope)) {
 		return true;
 	}
 
 	if (false == SCOPE_CAN_BE_DISPOSED(async_scope)) {
 		return false;
 	}
 
-	ZEND_ASYNC_SCOPE_SET_DISPOSED(scope);
+	ZEND_ASYNC_SCOPE_SET_DISPOSING(scope);
 
 	// Dispose all child scopes
 	for (uint32_t i = 0; i < async_scope->scope.scopes.length; ++i) {
 		async_scope_t *child_scope = (async_scope_t *) async_scope->scope.scopes.data[i];
 		child_scope->scope.event.dispose(&child_scope->scope.event);
 		if (UNEXPECTED(EG(exception))) {
+			ZEND_ASYNC_SCOPE_CLR_DISPOSING(scope);
 			// If an exception occurs during child scope disposal, we stop further processing
 			return false;
 		}
 	}
 
+	ZEND_ASYNC_SCOPE_CLR_DISPOSING(scope);
+
 	// Dispose the scope
 	async_scope->scope.event.dispose(&async_scope->scope.event);
 	return true;
@@ -1532,12 +1535,6 @@ static zend_always_inline bool try_to_handle_exception(
 
 static void async_scope_call_finally_handlers_dtor(finally_handlers_context_t *context)
 {
-	zend_async_scope_t *scope = context->target;
-	if (ZEND_ASYNC_EVENT_REF(&scope->event) > 0) {
-		ZEND_ASYNC_EVENT_DEL_REF(&scope->event);
-	}
-
-	scope->try_to_dispose(scope);
 	context->target = NULL;
 }
 
@@ -1566,7 +1563,6 @@ static bool async_scope_call_finally_handlers(async_scope_t *scope)
 		zend_array_destroy(finally_handlers);
 		return false;
 	} else {
-		ZEND_ASYNC_EVENT_ADD_REF(&scope->scope.event);
 		return true;
 	}
 }