JIT: Fixed numeric string index handling

php · Nov 1, 2021 · f1e6a7d · f1e6a7d
1 parent cd32b47
commit f1e6a7d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -347,7 +347,7 @@ static zval* ZEND_FASTCALL zend_jit_symtable_lookup_rw(HashTable *ht, zend_strin
 		if (_zend_handle_numeric_str_ex(str->val, str->len, &idx)) {
 			retval = zend_hash_index_find(ht, idx);
 			if (!retval) {
-				if (UNEXPECTED(zend_undefined_index_write(ht, str) == FAILURE)) {
+				if (UNEXPECTED(zend_undefined_offset_write(ht, idx) == FAILURE)) {
 					return NULL;
 				}
 				retval = zend_hash_index_add_new(ht, idx, &EG(uninitialized_zval));

diff --git a/ext/opcache/tests/jit/fetch_dim_rw_002.phpt b/ext/opcache/tests/jit/fetch_dim_rw_002.phpt
@@ -0,0 +1,17 @@
+--TEST--
+JIT FETCH_DIM_RW: 002
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--FILE--
+<?php
+$a = [];
+$k = "0";
+$a[$k]++;
+var_dump($a[$k]);
+?>
+--EXPECTF--
+Warning: Undefined array key 0 in %sfetch_dim_rw_002.php on line 4
+int(1)