diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-20 11:58:23 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-20 11:58:23 +0800 |
| commit | 1c3b99c4ff20bdce1c589318c39e7fd20d6f9ee2 (patch) | |
| tree | e794613b7afe75f962692fa08182d5718f3a1b20 | |
| parent | d66045fe73fb646f15a45286313231908e656a37 (diff) | |
| download | php-git-1c3b99c4ff20bdce1c589318c39e7fd20d6f9ee2.tar.gz | |
Throw exception will override EX(opline)
| -rw-r--r-- | Zend/zend_vm_def.h | 6 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c3022ef0d0..9198964b15 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end): ZEND_VM_RETURN(); } - LOAD_OPLINE(); + opline = EX(opline); if (object) { OBJ_RELEASE(object); @@ -7866,8 +7866,8 @@ ZEND_VM_C_LABEL(call_trampoline_end): if (UNEXPECTED(EG(exception) != NULL)) { zend_throw_exception_internal(NULL); - if (RETURN_VALUE_USED(OPLINE)) { - zval_ptr_dtor(EX_VAR(OPLINE->result.var)); + if (RETURN_VALUE_USED(opline)) { + zval_ptr_dtor(EX_VAR(opline->result.var)); } HANDLE_EXCEPTION_LEAVE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index efa0893892..489529e917 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1893,7 +1893,7 @@ call_trampoline_end: ZEND_VM_RETURN(); } - LOAD_OPLINE(); + opline = EX(opline); if (object) { OBJ_RELEASE(object); @@ -1902,8 +1902,8 @@ call_trampoline_end: if (UNEXPECTED(EG(exception) != NULL)) { zend_throw_exception_internal(NULL); - if (RETURN_VALUE_USED(OPLINE)) { - zval_ptr_dtor(EX_VAR(OPLINE->result.var)); + if (RETURN_VALUE_USED(opline)) { + zval_ptr_dtor(EX_VAR(opline->result.var)); } HANDLE_EXCEPTION_LEAVE(); } |