diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-05-25 16:45:45 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-05-25 16:45:45 +0300 |
| commit | 3376f19742cc68448a26404df98f709f5255a262 (patch) | |
| tree | 8aa9f97cd6df5e7e19a9c3d16876d303194c1a41 | |
| parent | 201491e61b366f2edbd97bed0142681af9f052a1 (diff) | |
| download | php-git-3376f19742cc68448a26404df98f709f5255a262.tar.gz | |
Check for ZEND_HANDLE_EXCEPTION opcode before accessing opline trace info.
| -rw-r--r-- | ext/opcache/jit/zend_jit_vm_helpers.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ext/opcache/jit/zend_jit_vm_helpers.c b/ext/opcache/jit/zend_jit_vm_helpers.c index 9a8e069e1b..04eb311cd7 100644 --- a/ext/opcache/jit/zend_jit_vm_helpers.c +++ b/ext/opcache/jit/zend_jit_vm_helpers.c @@ -538,6 +538,11 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex, #endif zend_execute_data *prev_call = EX(call); + if (UNEXPECTED(opline->opcode == ZEND_HANDLE_EXCEPTION)) { + /* Abort trace because of exception */ + return ZEND_JIT_TRACE_STOP_EXCEPTION; + } + orig_opline = opline; jit_extension = @@ -552,12 +557,6 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex, } while (1) { - if (UNEXPECTED(opline->opcode == ZEND_HANDLE_EXCEPTION)) { - /* Abort trace because of exception */ - stop = ZEND_JIT_TRACE_STOP_EXCEPTION; - break; - } - ce1 = ce2 = NULL; op1_type = op2_type = op3_type = IS_UNKNOWN; if ((opline->op1_type & (IS_TMP_VAR|IS_VAR|IS_CV)) @@ -785,6 +784,12 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data *ex, opline = EX(opline); #endif + if (UNEXPECTED(opline->opcode == ZEND_HANDLE_EXCEPTION)) { + /* Abort trace because of exception */ + stop = ZEND_JIT_TRACE_STOP_EXCEPTION; + break; + } + trace_flags = ZEND_OP_TRACE_INFO(opline, offset)->trace_flags; if (trace_flags) { if (trace_flags & ZEND_JIT_TRACE_JITED) { |