[php-src] master: Fix more "Applying non-zero offset XX to null pointer" warnings (See GH-13834)

From: Date: Tue, 09 Apr 2024 20:14:03 +0000
Subject: [php-src] master: Fix more "Applying non-zero offset XX to null pointer" warnings (See GH-13834)
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-128006@lists.php.net to get a copy of this message
Author: Dmitry Stogov (dstogov) Date: 2024-04-09T23:12:33+03:00 Commit: https://github.com/php/php-src/commit/11d3ded235ed4cd884a2328d38492b94808a830c Raw diff: https://github.com/php/php-src/commit/11d3ded235ed4cd884a2328d38492b94808a830c.diff Fix more "Applying non-zero offset XX to null pointer" warnings (See GH-13834) Changed paths: M ext/opcache/jit/zend_jit_trace.c Diff: diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index 749b2a307812..db8fa7356c99 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -7227,7 +7227,9 @@ static const void *zend_jit_trace_exit_to_vm(uint32_t trace_num, uint32_t exit_n /* Deoptimization */ stack_size = zend_jit_traces[trace_num].exit_info[exit_num].stack_size; - stack = zend_jit_traces[trace_num].stack_map + zend_jit_traces[trace_num].exit_info[exit_num].stack_offset; + stack = zend_jit_traces[trace_num].exit_info[exit_num].stack_size ? + zend_jit_traces[trace_num].stack_map + zend_jit_traces[trace_num].exit_info[exit_num].stack_offset : + NULL; if (!zend_jit_trace_deoptimization(&ctx, 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) for (i = 0; i < t->exit_count; i++) { const zend_op_array *op_array = t->exit_info[i].op_array; uint32_t stack_size = t->exit_info[i].stack_size; - zend_jit_trace_stack *stack = t->stack_map + t->exit_info[i].stack_offset; + zend_jit_trace_stack *stack = t->exit_info[i].stack_size ? t->stack_map + t->exit_info[i].stack_offset : NULL; fprintf(stderr, " exit_%d:", i); if (t->exit_info[i].opline) {

« previous php.cvs (#128006) next »