* Fixes in await methods.

  Corrected the memory release model for the async_await_callback_t structure.

Author: EdmondDantes

async.c

@@ -249,12 +249,14 @@ PHP_FUNCTION(Async_awaitAny)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(cancellation, async_ce_awaitable);
 	ZEND_PARSE_PARAMETERS_END();
 
+	SCHEDULER_LAUNCH;
+
 	HashTable * results = zend_new_array(8);
 
 	async_await_futures(futures,
 		1,
 		false,
-		ZEND_ASYNC_OBJECT_TO_EVENT(cancellation),
+		cancellation != NULL ? ZEND_ASYNC_OBJECT_TO_EVENT(cancellation) : NULL,
 		0,
 		0,
 		results,
@@ -273,7 +275,11 @@ PHP_FUNCTION(Async_awaitAny)
 	}
 
 	zval result;
-	ZVAL_COPY(&result, zend_hash_index_find(results, 0));
+	ZEND_HASH_FOREACH_VAL(results, zval *item) {
+		ZVAL_COPY(&result, item);
+		break;
+	} ZEND_HASH_FOREACH_END();
+
 	zend_array_release(results);
 
 	RETURN_ZVAL(&result, 0, 0);
@@ -290,13 +296,15 @@ PHP_FUNCTION(Async_awaitFirstSuccess)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(cancellation, async_ce_awaitable);
 	ZEND_PARSE_PARAMETERS_END();
 
+	SCHEDULER_LAUNCH;
+
 	HashTable * results = zend_new_array(8);
 	HashTable * errors = zend_new_array(8);
 
 	async_await_futures(futures,
 		1,
 		true,
-		ZEND_ASYNC_OBJECT_TO_EVENT(cancellation),
+		cancellation != NULL ? ZEND_ASYNC_OBJECT_TO_EVENT(cancellation) : NULL,
 		0,
 		0,
 		results,
@@ -339,12 +347,14 @@ PHP_FUNCTION(Async_awaitAll)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(cancellation, async_ce_awaitable);
 	ZEND_PARSE_PARAMETERS_END();
 
+	SCHEDULER_LAUNCH;
+
 	HashTable * results = zend_new_array(8);
 
 	async_await_futures(futures,
 		0,
 		false,
-		ZEND_ASYNC_OBJECT_TO_EVENT(cancellation),
+		cancellation != NULL ? ZEND_ASYNC_OBJECT_TO_EVENT(cancellation) : NULL,
 		0,
 		0,
 		results,
@@ -371,13 +381,15 @@ PHP_FUNCTION(Async_awaitAllWithErrors)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(cancellation, async_ce_awaitable);
 	ZEND_PARSE_PARAMETERS_END();
 
+	SCHEDULER_LAUNCH;
+
 	HashTable * results = zend_new_array(8);
 	HashTable * errors = zend_new_array(8);
 
 	async_await_futures(futures,
 		0,
 		true,
-		ZEND_ASYNC_OBJECT_TO_EVENT(cancellation),
+		cancellation != NULL ? ZEND_ASYNC_OBJECT_TO_EVENT(cancellation) : NULL,
 		0,
 		0,
 		results,
@@ -416,12 +428,14 @@ PHP_FUNCTION(Async_awaitAnyOf)
 		Z_PARAM_OBJ_OF_CLASS_OR_NULL(cancellation, async_ce_awaitable);
 	ZEND_PARSE_PARAMETERS_END();
 
+	SCHEDULER_LAUNCH;
+
 	HashTable * results = zend_new_array(8);
 
 	async_await_futures(futures,
 		(int)count,
 		false,
-		ZEND_ASYNC_OBJECT_TO_EVENT(cancellation),
+		cancellation != NULL ? ZEND_ASYNC_OBJECT_TO_EVENT(cancellation) : NULL,
 		0,
 		0,
 		results,
@@ -453,10 +467,12 @@ PHP_FUNCTION(Async_awaitAnyOfWithErrors)
 	HashTable * results = zend_new_array(8);
 	HashTable * errors = zend_new_array(8);
 
+	SCHEDULER_LAUNCH;
+
 	async_await_futures(futures,
 		(int)count,
 		true,
-		ZEND_ASYNC_OBJECT_TO_EVENT(cancellation),
+		cancellation != NULL ? ZEND_ASYNC_OBJECT_TO_EVENT(cancellation) : NULL,
 		0,
 		0,
 		results,
@@ -490,6 +506,8 @@ PHP_FUNCTION(Async_delay)
 		Z_PARAM_LONG(ms)
 	ZEND_PARSE_PARAMETERS_END();
 
+	SCHEDULER_LAUNCH;
+
 	zend_coroutine_t *coroutine = ZEND_ASYNC_CURRENT_COROUTINE;
 
 	if (UNEXPECTED(coroutine == NULL)) {

async_API.c

@@ -362,6 +362,21 @@ static zend_always_inline zend_async_event_t * zval_to_event(const zval * curren
 	}
 }
 
+void async_waiting_callback_dispose(zend_async_event_callback_t *callback, zend_async_event_t * event)
+{
+	async_await_callback_t * await_callback = (async_await_callback_t *) callback;
+	async_await_context_t * await_context = await_callback->await_context;
+
+	await_callback->await_context = NULL;
+
+	if (await_context == NULL) {
+		return;
+	}
+
+	await_context->dtor(await_context);
+	await_callback->prev_dispose(callback, event);
+}
+
 void async_waiting_callback(
 	zend_async_event_t *event,
 	zend_async_event_callback_t *callback,
@@ -708,6 +723,8 @@ void async_await_futures(
 				return;
 			}
 
+			callback->prev_dispose = callback->callback.base.dispose;
+			callback->callback.base.dispose = async_waiting_callback_dispose;
 			await_context->ref_count++;
 
 		} ZEND_HASH_FOREACH_END();

async_API.h

@@ -47,6 +47,7 @@ typedef struct
 	async_await_context_t *await_context;
 	// The key index for the result
 	zval key;
+	zend_async_event_callback_dispose_fn prev_dispose;
 } async_await_callback_t;
 
 typedef struct