Merge check

php · Nov 14, 2024 · 2c3531d · 2c3531d
1 parent bdd93e3
commit 2c3531d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 32 deletions.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -3806,13 +3806,6 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM)
 	SAVE_OPLINE();
 	function_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
 	if (zend_is_callable_ex(function_name, NULL, 0, NULL, &fcc, &error)) {
-		/* Deprecation can be emitted from zend_is_callable_ex(), which can
-		 * invoke a user error handler and throw an exception. */
-		if (UNEXPECTED(EG(exception))) {
-			FREE_OP2();
-			HANDLE_EXCEPTION();
-		}
-
 		ZEND_ASSERT(!error);
 		func = fcc.function_handler;
 		object_or_called_scope = fcc.called_scope;
@@ -3834,7 +3827,10 @@ ZEND_VM_HANDLER(118, ZEND_INIT_USER_CALL, CONST, CONST|TMPVAR|CV, NUM)
 		}
 
 		FREE_OP2();
-		if ((OP2_TYPE & (IS_TMP_VAR|IS_VAR)) && UNEXPECTED(EG(exception))) {
+		/* Deprecation can be emitted from zend_is_callable_ex(), which can
+		 * invoke a user error handler and throw an exception; so we cannot
+		 * rely on OP2_TYPE. */
+		if (UNEXPECTED(EG(exception))) {
 			if (call_info & ZEND_CALL_CLOSURE) {
 				zend_object_release(ZEND_CLOSURE_OBJECT(func));
 			} else if (call_info & ZEND_CALL_RELEASE_THIS) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h