diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-07-07 12:43:58 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-07-07 12:43:58 +0200 |
| commit | 2bd4b18c24a05779086f5ee81ae8252577787df5 (patch) | |
| tree | efb753a1780db40ce261f3388b1b0609b8432f4a | |
| parent | 0ac2371b5a5101aece913ce8bef10b968c26cbbb (diff) | |
| parent | 333528089e053b1db35a073955b3ec7244881667 (diff) | |
| download | php-git-2bd4b18c24a05779086f5ee81ae8252577787df5.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
| -rw-r--r-- | Zend/zend_execute.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6122566b3e..3bd1917539 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2488,8 +2488,7 @@ static zend_always_inline void i_cleanup_unfinished_execution(zend_execute_data } if (call->func->common.fn_flags & ZEND_ACC_CLOSURE) { zend_object_release((zend_object *) call->func->common.prototype); - } - if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { + } else if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { zend_string_release(call->func->common.function_name); zend_free_trampoline(call->func); } |