mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also make sure binary op operands can't be undef

Browse Source 
Otherwise we will end up passing undef to xyz_function etc, which
is not permitted.
This commit is contained in:
Nikita Popov 2021-09-09 15:04:30 +02:00
parent bac054dbf3
commit 8c3d33a054
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/opcache/jit/zend_jit.c
View File

@ -2070,6 +2070,9 @@ failure:
static bool zend_jit_supported_binary_op(zend_uchar op, uint32_t op1_info, uint32_t op2_info)
{
if ((op1_info & MAY_BE_UNDEF) || (op2_info & MAY_BE_UNDEF)) {
return false;
}
switch (op) {
case ZEND_POW:
case ZEND_DIV:
@ -2522,9 +2525,6 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
}
op1_info = OP1_INFO();
op2_info = OP2_INFO();
if ((op1_info & MAY_BE_UNDEF) || (op2_info & MAY_BE_UNDEF)) {
break;
}
if (!zend_jit_supported_binary_op(
opline->extended_value, op1_info, op2_info)) {
break;

8
ext/opcache/jit/zend_jit_trace.c
View File

@ -4157,9 +4157,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
CHECK_OP1_TRACE_TYPE();
op2_info = OP2_INFO();
CHECK_OP2_TRACE_TYPE();
if ((op1_info & MAY_BE_UNDEF) || (op2_info & MAY_BE_UNDEF)) {
break;
}
if (!zend_jit_supported_binary_op(
opline->extended_value, op1_info, op2_info)) {
break;
@ -4184,11 +4181,6 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
}
goto done;
case ZEND_ASSIGN_DIM_OP:
if (opline->extended_value == ZEND_POW
|| opline->extended_value == ZEND_DIV) {
// TODO: check for division by zero ???
break;
}
if (opline->result_type != IS_UNUSED) {
break;
}

14
ext/opcache/tests/jit/assign_dim_op_003.phpt Normal file
View File

@ -0,0 +1,14 @@
--TEST--
JIT ASSIGN_DIM_OP: Undefined variable variation
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
--FILE--
<?php
$a = [];
$a[] &= $b;
?>
--EXPECTF--
Warning: Undefined variable $b in %s on line %d