php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 15:12:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Undef result if undef dim warning promoted to exception
This commit is contained in:
Nikita Popov
2021-09-28 11:36:35 +02:00
parent 39d4978add fdcacc7015
commit 2a3caef40b
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/opcache/jit/zend_jit_helpers.c
View File

@@ -581,6 +581,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di
goto str_index;
case IS_UNDEF:
if (!zend_jit_undefined_op_helper_write(ht, EG(current_execute_data)->opline->op2.var)) {
undef_result_after_exception();
return NULL;
}
ZEND_FALLTHROUGH;
@@ -644,6 +645,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim
goto str_index;
case IS_UNDEF:
if (!zend_jit_undefined_op_helper_write(ht, EG(current_execute_data)->opline->op2.var)) {
undef_result_after_exception();
return NULL;
}
ZEND_FALLTHROUGH;

38
ext/opcache/tests/jit/assign_dim_undef_exception.phpt Normal file
View File

@@ -0,0 +1,38 @@
--TEST--
Undef to exception for assign dim offset
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
set_error_handler(function($_, $m){
throw new Exception($m);
});
function test1() {
$a = [];
$res = $a[$undef] = null;
}
function test2() {
$a = [];
$res = $a[$undef] += 1;
}
function test3() {
$a = [];
$res = isset($a[$undef]);
}
try {
test1();
} catch (Exception $e) {
echo $e->getMessage(), "\n";
}
try {
test2();
} catch (Exception $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Undefined variable $undef
Undefined variable $undef