]> granicus.if.org Git - php/commitdiff
JIT: Check exception after jit_assign_dim_op_helper
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 22 Oct 2019 13:33:12 +0000 (15:33 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 23 Oct 2019 08:07:59 +0000 (10:07 +0200)
ext/opcache/jit/zend_jit_x86.dasc

index 0739db4833d938eb08b59619e641f7d5851e29c0..79395ab6febda9ce32401de60d12f5a0ea15ff3a 100644 (file)
@@ -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