Skip to content

Commit 11d3ded

Browse files
committed
Fix more "Applying non-zero offset XX to null pointer" warnings (See GH-13834)
1 parent 5708df7 commit 11d3ded

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7227,7 +7227,9 @@ static const void *zend_jit_trace_exit_to_vm(uint32_t trace_num, uint32_t exit_n
72277227

72287228
/* Deoptimization */
72297229
stack_size = zend_jit_traces[trace_num].exit_info[exit_num].stack_size;
7230-
stack = zend_jit_traces[trace_num].stack_map + zend_jit_traces[trace_num].exit_info[exit_num].stack_offset;
7230+
stack = zend_jit_traces[trace_num].exit_info[exit_num].stack_size ?
7231+
zend_jit_traces[trace_num].stack_map + zend_jit_traces[trace_num].exit_info[exit_num].stack_offset :
7232+
NULL;
72317233

72327234
if (!zend_jit_trace_deoptimization(&ctx,
72337235
zend_jit_traces[trace_num].exit_info[exit_num].flags,
@@ -7769,7 +7771,7 @@ static void zend_jit_dump_exit_info(zend_jit_trace_info *t)
77697771
for (i = 0; i < t->exit_count; i++) {
77707772
const zend_op_array *op_array = t->exit_info[i].op_array;
77717773
uint32_t stack_size = t->exit_info[i].stack_size;
7772-
zend_jit_trace_stack *stack = t->stack_map + t->exit_info[i].stack_offset;
7774+
zend_jit_trace_stack *stack = t->exit_info[i].stack_size ? t->stack_map + t->exit_info[i].stack_offset : NULL;
77737775

77747776
fprintf(stderr, " exit_%d:", i);
77757777
if (t->exit_info[i].opline) {

0 commit comments

Comments
 (0)