Commit 7dc859d75f5 for php.net
commit 7dc859d75f50b0c20d6924272dbcb84055cd97cb
Merge: 934d4ff95fa 027a634280a
Author: Ilia Alshanetsky <ilia@ilia.ws>
Date: Mon Sep 21 21:16:11 2026 -0400
Merge branch 'PHP-8.5'
* PHP-8.5:
Zend: release the trampoline when zend_call_function() bails early
diff --cc Zend/zend_execute_API.c
index ac1683bb368,0014cfce2d2..59fb717b5d2
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@@ -875,9 -864,8 +875,10 @@@ zend_result zend_call_function(zend_fca
zend_deprecated_function(func);
if (UNEXPECTED(EG(exception))) {
- zend_vm_stack_free_call_frame(call);
+ zend_release_fcall_info_cache(fci_cache);
+ if (pinned_this) {
+ OBJ_RELEASE(pinned_this);
+ }
return SUCCESS;
}
}
@@@ -1022,9 -982,7 +1023,10 @@@ cleanup_args
if (zend_handle_undef_args(call) == FAILURE) {
zend_vm_stack_free_args(call);
zend_vm_stack_free_call_frame(call);
+ zend_release_fcall_info_cache(fci_cache);
+ if (pinned_this) {
+ OBJ_RELEASE(pinned_this);
+ }
return SUCCESS;
}
}