From 8cdbcd7d91a83fefe5ca0162b9a4f42c8bace040 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 22 Oct 2019 15:33:12 +0200 Subject: [PATCH] JIT: Check exception after jit_assign_dim_op_helper --- ext/opcache/jit/zend_jit_x86.dasc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 0739db4833..79395ab6fe 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -4965,6 +4965,9 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, const |.if not(X64) | add r4, 8 |.endif + if (!zend_jit_check_exception(Dst)) { + return 0; + } if (op1_info & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_ARRAY)) { | jmp >9 // END -- 2.50.1