archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed codegeneration for NOT

Browse source 
Fixes oss-fuzz #63749
This commit is contained in:
Dmitry Stogov 2023-10-31 08:34:14 +03:00
parent 037d6d0924
commit ed37ab9d14
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/opcache/jit/zend_jit_ir.c
View file

@ -3864,7 +3864,8 @@ static void zend_jit_type_check_undef(zend_jit_ctx *jit,
uint32_t var, uint32_t var,
const zend_op *opline, const zend_op *opline,
bool check_exception, bool check_exception,
bool in_cold_path) bool in_cold_path,
bool undef_result)
{ {
ir_ref if_def = ir_IF(type); ir_ref if_def = ir_IF(type);
@ -3878,7 +3879,11 @@ static void zend_jit_type_check_undef(zend_jit_ctx *jit,
} }
ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_undefined_op_helper), ir_CONST_U32(var)); ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_undefined_op_helper), ir_CONST_U32(var));
if (check_exception) { if (check_exception) {
zend_jit_check_exception(jit); if (undef_result) {
zend_jit_check_exception_undef_result(jit, opline);
} else {
zend_jit_check_exception(jit);
}
} }
ir_MERGE_WITH_EMPTY_TRUE(if_def); ir_MERGE_WITH_EMPTY_TRUE(if_def);
} }
@ -7301,7 +7306,7 @@ static int zend_jit_bool_jmpznz(zend_jit_ctx *jit, const zend_op *opline, uint32
zend_jit_type_check_undef(jit, zend_jit_type_check_undef(jit,
type, type,
opline->op1.var, opline->op1.var,
opline, 1, 0); opline, 1, 0, 1);
} }
if (set_bool) { if (set_bool) {
jit_set_Z_TYPE_INFO(jit, res_addr, set_bool_not ? IS_TRUE : IS_FALSE); jit_set_Z_TYPE_INFO(jit, res_addr, set_bool_not ? IS_TRUE : IS_FALSE);
@ -12201,12 +12206,12 @@ static int zend_jit_fetch_dim_read(zend_jit_ctx *jit,
jit_SET_EX_OPLINE(jit, opline); jit_SET_EX_OPLINE(jit, opline);
if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) { if (opline->opcode != ZEND_FETCH_DIM_IS && (op1_info & MAY_BE_UNDEF)) {
may_throw = 1; may_throw = 1;
zend_jit_type_check_undef(jit, jit_Z_TYPE(jit, op1_addr), opline->op1.var, NULL, 0, 1); zend_jit_type_check_undef(jit, jit_Z_TYPE(jit, op1_addr), opline->op1.var, NULL, 0, 1, 0);
} }
if (op2_info & MAY_BE_UNDEF) { if (op2_info & MAY_BE_UNDEF) {
may_throw = 1; may_throw = 1;
zend_jit_type_check_undef(jit, jit_Z_TYPE(jit, op2_addr), opline->op2.var, NULL, 0, 1); zend_jit_type_check_undef(jit, jit_Z_TYPE(jit, op2_addr), opline->op2.var, NULL, 0, 1, 0);
} }
} }

18
ext/opcache/tests/jit/not_003.phpt Normal file
View file

@ -0,0 +1,18 @@
--TEST--
JIT NOT: 003
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=1M
opcache.protect_memory=1
--FILE--
<?php
set_error_handler(function(){y;}) . !$y;
?>
--EXPECTF--
Fatal error: Uncaught Error: Undefined constant "y" in %snot_003.php:2
Stack trace:
#0 %snot_003.php(2): {closure}(2, '%s', '%s', 2)
#1 {main}
thrown in %snot_003.php on line 2