Skip to content

Commit d78ee7c

Browse files
committed
JIT: Fix NULL dereference
1 parent d60ea68 commit d78ee7c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

ext/opcache/jit/zend_jit_ir.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -12393,7 +12393,7 @@ static int zend_jit_ffi_abc(zend_jit_ctx *jit,
1239312393
jit_SIDE_EXIT(jit, ir_CONST_ADDR(exit_addr));
1239412394
}
1239512395
} else if (!op2_range || op2_range->min < 0 || op2_range->max >= ffi_type->array.length) {
12396-
if (op2_range->max < 0 || op2_range->min >= ffi_type->array.length) {
12396+
if (op2_range && (op2_range->max < 0 || op2_range->min >= ffi_type->array.length)) {
1239712397
/* Always out of range */
1239812398
exit_point = zend_jit_trace_get_exit_point(opline, 0);
1239912399
exit_addr = zend_jit_trace_get_exit_addr(exit_point);
@@ -13183,7 +13183,6 @@ static int zend_jit_ffi_assign_dim(zend_jit_ctx *jit,
1318313183
ir_ref cdata_ref = ir_LOAD_A(ir_ADD_OFFSET(obj_ref, offsetof(zend_ffi_cdata, ptr)));
1318413184
ir_ref ptr = ir_ADD_A(cdata_ref, ir_MUL_L(jit_Z_LVAL(jit, op2_addr), ir_CONST_LONG(el_type->size)));
1318513185

13186-
1318713186
ZEND_ASSERT(!res_addr);
1318813187

1318913188
switch (el_type->kind) {

0 commit comments

Comments
 (0)