From: Nikita Popov <nikic@php.net>
Date: Tue, 5 Jul 2016 12:53:20 +0000 (+0200)
Subject: Closure::fromCallable(): Fix stack corruption
X-Git-Tag: php-7.1.0alpha3~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=041476f4ae1eecce97acd7b02c871b373d4cc0e5;p=php

Closure::fromCallable(): Fix stack corruption

So the tests work at least...
---

diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 8d101ddcc8..5c5e8a6cb5 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -269,6 +269,7 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable,
 	zend_fcall_info_cache fcc;
 	zend_function *mptr;
 	zval instance;
+	zend_internal_function call;
 
 	if (!zend_is_callable_ex(callable, NULL, 0, NULL, &fcc, error)) {
 		return FAILURE;
@@ -280,7 +281,6 @@ static int zend_create_closure_from_callable(zval *return_value, zval *callable,
 	}
 
 	if (mptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) {
-		zend_internal_function call;
 		memset(&call, 0, sizeof(zend_internal_function));
 
 		call.type = ZEND_INTERNAL_FUNCTION;