diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-04-17 14:56:01 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-04-17 14:56:01 +0300 |
| commit | b2376be81ddd8b3401acde47443744a50c25a4bb (patch) | |
| tree | 0226bb99ea9536bdbb8dedf2ea910d869ea0e405 | |
| parent | 0b709e3409a1899caa6aaf3a5442e83524e2355c (diff) | |
| parent | d31ccb5fc8a0f6f5fded085ee170c8bd99eb83e7 (diff) | |
| download | php-git-b2376be81ddd8b3401acde47443744a50c25a4bb.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
zend_timeout() may access EX(opline)
| -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 900c21c3d3..8a9d74c1f8 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -9387,10 +9387,10 @@ ZEND_VM_DEFINE_OP(137, ZEND_OP_DATA); ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY) { EG(vm_interrupt) = 0; + SAVE_OPLINE(); if (EG(timed_out)) { zend_timeout(0); } else if (zend_interrupt_function) { - SAVE_OPLINE(); zend_interrupt_function(execute_data); ZEND_VM_ENTER(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2fce1be298..559edd070c 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2877,10 +2877,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_JMP_FORWARD_SPEC_H static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) { EG(vm_interrupt) = 0; + SAVE_OPLINE(); if (EG(timed_out)) { zend_timeout(0); } else if (zend_interrupt_function) { - SAVE_OPLINE(); zend_interrupt_function(execute_data); ZEND_VM_ENTER(); } |