diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-10-09 02:39:07 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-10-09 02:39:07 +0300 |
| commit | c6af0aa33f6dafe90f60b3d20231837f9e25dfb6 (patch) | |
| tree | 0d38ead572c517463ed431f388943adc5d5d0d9f /Zend/zend_execute_API.c | |
| parent | 93748bf9ddf971e42917565e35e122af96be85a6 (diff) | |
| download | php-git-c6af0aa33f6dafe90f60b3d20231837f9e25dfb6.tar.gz | |
Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 965b08eb38..9d255edfd4 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -839,15 +839,16 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / } Z_OBJ(call->This) = fci->object; + if (UNEXPECTED(func->op_array.fn_flags & ZEND_ACC_CLOSURE)) { + ZEND_ASSERT(GC_TYPE((zend_object*)func->op_array.prototype) == IS_OBJECT); + GC_REFCOUNT((zend_object*)func->op_array.prototype)++; + ZEND_ADD_CALL_FLAG(call, ZEND_CALL_CLOSURE); + } + if (func->type == ZEND_USER_FUNCTION) { int call_via_handler = (func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) != 0; EG(scope) = func->common.scope; call->symbol_table = fci->symbol_table; - if (UNEXPECTED(func->op_array.fn_flags & ZEND_ACC_CLOSURE)) { - ZEND_ASSERT(GC_TYPE((zend_object*)func->op_array.prototype) == IS_OBJECT); - GC_REFCOUNT((zend_object*)func->op_array.prototype)++; - ZEND_ADD_CALL_FLAG(call, ZEND_CALL_CLOSURE); - } 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); |