diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-09-24 21:06:07 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-09-24 21:06:07 +0200 |
| commit | abf6a0b376b42e0ce60da039b11c6fdf994431fb (patch) | |
| tree | 20d800b3ba6c36f4b88f884bfc81d26e00af32ee | |
| parent | 808f62bb4d9812e9b7b35c87f3e90e5fc2bc244b (diff) | |
| download | php-git-abf6a0b376b42e0ce60da039b11c6fdf994431fb.tar.gz | |
Fix missing LOAD_OPLINE() for ZEND_USER_OPCODE_LEAVE
| -rw-r--r-- | Zend/zend_vm_def.h | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index daad1c120d..f0e7278459 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7196,6 +7196,7 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY) case ZEND_USER_OPCODE_ENTER: ZEND_VM_ENTER(); case ZEND_USER_OPCODE_LEAVE: + LOAD_OPLINE(); ZEND_VM_LEAVE(); case ZEND_USER_OPCODE_DISPATCH: ZEND_ASSERT(EX(opline) == opline); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index ea01110d96..253a2d7a13 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1583,6 +1583,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_ case ZEND_USER_OPCODE_ENTER: ZEND_VM_ENTER(); case ZEND_USER_OPCODE_LEAVE: + LOAD_OPLINE(); ZEND_VM_LEAVE(); case ZEND_USER_OPCODE_DISPATCH: ZEND_ASSERT(EX(opline) == opline); |