From 35d0405c4790f0ce668c9e1b8b05197e55d29a05 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Mon, 5 Oct 2015 17:49:32 +0200 Subject: Allow random $this on non-internal Closures again As it turns out, there is actually no reason to prevent this, it even was a bigger BC break than expected... Also fixes a memory leak (the Closure leaks) when calling internal functions via Closure by moving it out of leave helper onto caller side for TOP_CODE: $z = new SplStack; $z->push(20); $x = (new ReflectionMethod("SplStack", "pop"))->getClosure($z); var_dump($x()); --- Zend/zend_execute_API.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Zend/zend_execute_API.c') diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 965b08eb38..2030e0265a 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -851,6 +851,9 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / if (EXPECTED((func->op_array.fn_flags & ZEND_ACC_GENERATOR) == 0)) { zend_init_execute_data(call, &func->op_array, fci->retval); zend_execute_ex(call); + if (UNEXPECTED(ZEND_CALL_INFO(call) & ZEND_CALL_CLOSURE)) { + OBJ_RELEASE((zend_object*)func->op_array.prototype); + } } else { zend_generator_create_zval(call, &func->op_array, fci->retval); } -- cgit v1.2.1