diff options
author | Xinchen Hui <laruence@php.net> | 2015-03-04 17:17:48 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2015-03-04 17:17:48 +0800 |
commit | c16dcd3a8eff73c5ff8f1022cb7d693bd04845c7 (patch) | |
tree | fdd31c238b809c935ccfd75437d7faeca19f8bf4 | |
parent | ec00a4de4e8db83c07afde9a182d43fe73d860c9 (diff) | |
download | php-git-c16dcd3a8eff73c5ff8f1022cb7d693bd04845c7.tar.gz |
Fixed segfault
-rw-r--r-- | Zend/zend_vm_def.h | 2 | ||||
-rw-r--r-- | Zend/zend_vm_execute.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 7936af95b2..d0d6079b39 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1907,7 +1907,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY) zend_vm_stack_free_extra_args(execute_data); old_execute_data = execute_data; execute_data = EG(current_execute_data) = EX(prev_execute_data); - if (UNEXPECTED((old_execute_data->func->op_array.fn_flags & ZEND_ACC_CLOSURE) != 0) && EX(func)->op_array.prototype) { + if (UNEXPECTED((old_execute_data->func->op_array.fn_flags & ZEND_ACC_CLOSURE) != 0) && old_execute_data->func->op_array.prototype) { OBJ_RELEASE((zend_object*)old_execute_data->func->op_array.prototype); } object = Z_OBJ(old_execute_data->This); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a850098865..85ed9a50b5 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -396,7 +396,7 @@ static int ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) zend_vm_stack_free_extra_args(execute_data); old_execute_data = execute_data; execute_data = EG(current_execute_data) = EX(prev_execute_data); - if (UNEXPECTED((old_execute_data->func->op_array.fn_flags & ZEND_ACC_CLOSURE) != 0) && EX(func)->op_array.prototype) { + if (UNEXPECTED((old_execute_data->func->op_array.fn_flags & ZEND_ACC_CLOSURE) != 0) && old_execute_data->func->op_array.prototype) { OBJ_RELEASE((zend_object*)old_execute_data->func->op_array.prototype); } object = Z_OBJ(old_execute_data->This); |