com php-src: JIT: Check exception after jit_assign_dim_op _helper: ext/opcache/jit/zend_jit_x86.dasc
| From: | Nikita Popov | Date: | Wed, 23 Oct 2019 08:07:59 +0000 |
| Subject: | com php-src: JIT: Check exception after jit_assign_dim_op _helper: ext/opcache/jit/zend_jit_x86.dasc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109014@lists.php.net to get a copy of this message | ||
Commit: 8cdbcd7d91a83fefe5ca0162b9a4f42c8bace040
Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 22 Oct 2019 15:33:12 +0200
Parents: 097184cae715984901bad5d8872e2d4a153ec5bc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8cdbcd7d91a83fefe5ca0162b9a4f42c8bace040
Log:
JIT: Check exception after jit_assign_dim_op_helper
Changed paths:
M ext/opcache/jit/zend_jit_x86.dasc
Diff:
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 0739db4833d..79395ab6feb 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