From a6387c0aa5e5475d9a028697d4aa99bee9445e6d Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 24 Jun 2016 12:20:41 +0300 Subject: [PATCH] Added ability to make non-local control transfer through interrupt function --- Zend/zend_vm_def.h | 2 +- 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 feded0a9374..dcfaf97b100 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -8613,7 +8613,7 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY) } else if (zend_interrupt_function) { SAVE_OPLINE(); zend_interrupt_function(execute_data); - LOAD_OPLINE(); + ZEND_VM_ENTER(); } ZEND_VM_CONTINUE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 1943dc553a8..e68f8e4bedc 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2081,7 +2081,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPC } else if (zend_interrupt_function) { SAVE_OPLINE(); zend_interrupt_function(execute_data); - LOAD_OPLINE(); + ZEND_VM_ENTER(); } ZEND_VM_CONTINUE(); }