Delay releasing closures until after observer end

php · Nov 2, 2022 · 8e49d7f · 8e49d7f
1 parent 4935e10
commit 8e49d7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -695,7 +695,9 @@ static ZEND_NAMED_FUNCTION(zend_closure_internal_handler) /* {{{ */
 {
 	zend_closure *closure = (zend_closure*)ZEND_CLOSURE_OBJECT(EX(func));
 	closure->orig_internal_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-	OBJ_RELEASE((zend_object*)closure);
+	// Assign to EX(this) so that it is released after observer checks etc.
+	ZEND_ADD_CALL_FLAG(execute_data, ZEND_CALL_RELEASE_THIS);
+	Z_OBJ(EX(This)) = &closure->std;
 }
 /* }}} */
 

diff --git a/ext/zend_test/tests/observer_closure_03.phpt b/ext/zend_test/tests/observer_closure_03.phpt
@@ -7,9 +7,7 @@ zend_test.observer.enabled=1
 zend_test.observer.observe_all=1
 --FILE--
 <?php
-$closure = strlen(...);
-var_dump($closure('test'));
-
+var_dump(strlen(...)('test'));
 echo 'DONE' . PHP_EOL;
 ?>
 --EXPECTF--