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

Avoid setting ce for ref return_info

Browse source 
This is unlikely to matter in practice (due to short lifetime),
but necessary to satisfy the SSA integrity check.

Fixes oss-fuzz #46980.
This commit is contained in:
Nikita Popov 2022-04-24 17:35:05 +02:00
parent ab1d5a9d2a
commit 1254aa4f3e
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/Optimizer/zend_inference.c
View file

@ -4053,6 +4053,8 @@ uint32_t zend_get_return_info_from_signature_only(
if ((func->common.fn_flags & ZEND_ACC_RETURN_REFERENCE)
&& !(func->common.fn_flags & ZEND_ACC_GENERATOR)) {
type |= MAY_BE_REF;
*ce = NULL;
*ce_is_instanceof = 0;
}
return type;
}
@ -4136,7 +4138,7 @@ static void zend_func_return_info(const zend_op_array *op_array,
tmp |= t1;
if (ssa_op && info->ssa.var_info &&
ssa_op->op1_use >= 0 &&
ssa_op->op1_use >= 0 && !(t1 & MAY_BE_REF) &&
info->ssa.var_info[ssa_op->op1_use].ce) {
arg_ce = info->ssa.var_info[ssa_op->op1_use].ce;
arg_is_instanceof = info->ssa.var_info[ssa_op->op1_use].is_instanceof;