Skip to content

Commit b8ac4ca

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix possible NULL dereference
2 parents d6b8ef8 + 8b7f64f commit b8ac4ca

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,8 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
13691369
}
13701370
} else if (p->op == ZEND_JIT_TRACE_DO_ICALL) {
13711371
if (JIT_G(opt_level) < ZEND_JIT_LEVEL_OPT_FUNC) {
1372-
if (p->func != (zend_function*)&zend_pass_function
1372+
if (p->func
1373+
&& p->func != (zend_function*)&zend_pass_function
13731374
&& (zend_string_equals_literal(p->func->common.function_name, "extract")
13741375
|| zend_string_equals_literal(p->func->common.function_name, "compact")
13751376
|| zend_string_equals_literal(p->func->common.function_name, "get_defined_vars"))) {

0 commit comments

Comments
 (0)