Set opline before calling undef op helper

php · Oct 7, 2021 · 4558371 · 4558371
1 parent a743fd7
commit 4558371
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -12402,6 +12402,7 @@ static int zend_jit_isset_isempty_dim(dasm_State    **Dst,
 				if (op2_info & MAY_BE_ANY) {
 					|	IF_NOT_ZVAL_TYPE op2_addr, IS_UNDEF, >1
 				}
+				|	SET_EX_OPLINE opline, r0
 				|	mov FCARG1d, opline->op2.var
 				|	EXT_CALL zend_jit_undefined_op_helper, r0
 				|1:

diff --git a/ext/opcache/tests/jit/isset_001.phpt b/ext/opcache/tests/jit/isset_001.phpt
@@ -0,0 +1,17 @@
+--TEST--
+ISSET_ISEMPTY_DIM with undefined variable
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--FILE--
+<?php
+function test() {
+    var_dump(isset($a[$undef]));
+}
+test();
+?>
+--EXPECTF--
+Warning: Undefined variable $undef in %s on line %d
+bool(false)