archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Throw exception will override EX(opline)

Browse source
This commit is contained in:
Xinchen Hui 2015-04-20 11:58:23 +08:00
parent d66045fe73
commit 1c3b99c4ff
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_vm_def.h
View file

@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end):
ZEND_VM_RETURN(); ZEND_VM_RETURN();
} }
LOAD_OPLINE(); opline = EX(opline);
if (object) { if (object) {
OBJ_RELEASE(object); OBJ_RELEASE(object);
@ -7866,8 +7866,8 @@ ZEND_VM_C_LABEL(call_trampoline_end):
if (UNEXPECTED(EG(exception) != NULL)) { if (UNEXPECTED(EG(exception) != NULL)) {
zend_throw_exception_internal(NULL); zend_throw_exception_internal(NULL);
if (RETURN_VALUE_USED(OPLINE)) { if (RETURN_VALUE_USED(opline)) {
zval_ptr_dtor(EX_VAR(OPLINE->result.var)); zval_ptr_dtor(EX_VAR(opline->result.var));
} }
HANDLE_EXCEPTION_LEAVE(); HANDLE_EXCEPTION_LEAVE();
} }

6
Zend/zend_vm_execute.h
View file

@ -1893,7 +1893,7 @@ call_trampoline_end:
ZEND_VM_RETURN(); ZEND_VM_RETURN();
} }
LOAD_OPLINE(); opline = EX(opline);
if (object) { if (object) {
OBJ_RELEASE(object); OBJ_RELEASE(object);
@ -1902,8 +1902,8 @@ call_trampoline_end:
if (UNEXPECTED(EG(exception) != NULL)) { if (UNEXPECTED(EG(exception) != NULL)) {
zend_throw_exception_internal(NULL); zend_throw_exception_internal(NULL);
if (RETURN_VALUE_USED(OPLINE)) { if (RETURN_VALUE_USED(opline)) {
zval_ptr_dtor(EX_VAR(OPLINE->result.var)); zval_ptr_dtor(EX_VAR(opline->result.var));
} }
HANDLE_EXCEPTION_LEAVE(); HANDLE_EXCEPTION_LEAVE();
} }