Merge branch 'PHP-7.4'

1 files changed, 16 insertions, 12 deletions

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 4a31914e1a..ad15a38cf6 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2792,6 +2792,16 @@ static int zend_is_callable_check_class(zend_string *name, zend_class_entry *sco
 }
 /* }}} */
 
+static void free_fcc(zend_fcall_info_cache *fcc) {
+	if (fcc->function_handler &&
+		(fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
+		if (fcc->function_handler->common.function_name) {
+			zend_string_release_ex(fcc->function_handler->common.function_name, 0);
+		}
+		zend_free_trampoline(fcc->function_handler);
+	}
+}
+
 static zend_always_inline int zend_is_callable_check_func(int check_flags, zval *callable, zend_fcall_info_cache *fcc, int strict_class, char **error) /* {{{ */
 {
 	zend_class_entry *ce_org = fcc->calling_scope;
@@ -3131,13 +3141,8 @@ again:
 
 check_func:
 			ret = zend_is_callable_check_func(check_flags, callable, fcc, strict_class, error);
-			if (fcc == &fcc_local &&
-			    fcc->function_handler &&
-				(fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
-				if (fcc->function_handler->common.function_name) {
-					zend_string_release_ex(fcc->function_handler->common.function_name, 0);
-				}
-				zend_free_trampoline(fcc->function_handler);
+			if (fcc == &fcc_local) {
+				free_fcc(fcc);
 			}
 			return ret;
 
@@ -3205,6 +3210,9 @@ check_func:
 		case IS_OBJECT:
 			if (Z_OBJ_HANDLER_P(callable, get_closure) && Z_OBJ_HANDLER_P(callable, get_closure)(Z_OBJ_P(callable), &fcc->calling_scope, &fcc->function_handler, &fcc->object) == SUCCESS) {
 				fcc->called_scope = fcc->calling_scope;
+				if (fcc == &fcc_local) {
+					free_fcc(fcc);
+				}
 				return 1;
 			}
 			if (error) *error = estrdup("no array or string given");
@@ -3245,11 +3253,7 @@ ZEND_API zend_bool zend_make_callable(zval *callable, zend_string **callable_nam
 			add_next_index_str(callable, zend_string_copy(fcc.calling_scope->name));
 			add_next_index_str(callable, zend_string_copy(fcc.function_handler->common.function_name));
 		}
-		if (fcc.function_handler &&
-			(fcc.function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
-			zend_string_release_ex(fcc.function_handler->common.function_name, 0);
-			zend_free_trampoline(fcc.function_handler);
-		}
+		free_fcc(&fcc);
 		return 1;
 	}
 	return 0;