Skip to content

Commit e004e84

Browse files
committed
Fix incorrect optimization of ASSIGN_OP that may lead to memory leak
Fixes oss-fuzz #42506
1 parent 7c674e1 commit e004e84

File tree

2 files changed

+40
-3
lines changed

2 files changed

+40
-3
lines changed

ext/opcache/Optimizer/dfa_pass.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ static inline zend_bool can_elide_return_type_check(
323323
}
324324

325325
static zend_bool opline_supports_assign_contraction(
326-
zend_ssa *ssa, zend_op *opline, int src_var, uint32_t cv_var) {
326+
zend_op_array *op_array, zend_ssa *ssa, zend_op *opline, int src_var, uint32_t cv_var) {
327327
if (opline->opcode == ZEND_NEW) {
328328
/* see Zend/tests/generators/aborted_yield_during_new.phpt */
329329
return 0;
@@ -357,6 +357,13 @@ static zend_bool opline_supports_assign_contraction(
357357
return opline->op1_type != IS_CV || opline->op1.var != cv_var;
358358
}
359359

360+
if (opline->opcode == ZEND_ASSIGN_OP
361+
&& opline->op1_type == IS_CV
362+
&& opline->op1.var == cv_var
363+
&& zend_may_throw(opline, &ssa->ops[ssa->vars[src_var].definition], op_array, ssa)) {
364+
return 0;
365+
}
366+
360367
return 1;
361368
}
362369

@@ -1310,7 +1317,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
13101317
&& !ssa->vars[src_var].phi_use_chain
13111318
&& !ssa->vars[src_var].sym_use_chain
13121319
&& opline_supports_assign_contraction(
1313-
ssa, &op_array->opcodes[ssa->vars[src_var].definition],
1320+
op_array, ssa, &op_array->opcodes[ssa->vars[src_var].definition],
13141321
src_var, opline->result.var)
13151322
&& !variable_defined_or_used_in_range(ssa, EX_VAR_TO_NUM(opline->result.var),
13161323
ssa->vars[src_var].definition+1, op_1)
@@ -1467,7 +1474,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
14671474
&& !ssa->vars[src_var].phi_use_chain
14681475
&& !ssa->vars[src_var].sym_use_chain
14691476
&& opline_supports_assign_contraction(
1470-
ssa, &op_array->opcodes[ssa->vars[src_var].definition],
1477+
op_array, ssa, &op_array->opcodes[ssa->vars[src_var].definition],
14711478
src_var, opline->op1.var)
14721479
&& !variable_defined_or_used_in_range(ssa, EX_VAR_TO_NUM(opline->op1.var),
14731480
ssa->vars[src_var].definition+1, op_1)
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
--TEST--
2+
ASSIGN_OP 001: Incrrect optimization of ASSIGN_OP may lead to memory leak
3+
--INI--
4+
opcache.enable=1
5+
opcache.enable_cli=1
6+
opcache.optimization_level=-1
7+
--FILE--
8+
<?php
9+
function test() {
10+
for ($i = 0; $i < 10; $i++) {
11+
$a = $a += $a < true;
12+
$a += $a;
13+
$a = [];
14+
$a['b'] += 1;
15+
}
16+
}
17+
test();
18+
?>
19+
--EXPECTF--
20+
Warning: Undefined variable $a in %sassign_op_001.php on line 4
21+
22+
Warning: Undefined variable $a in %sassign_op_001.php on line 4
23+
24+
Warning: Undefined array key "b" in %sassign_op_001.php on line 7
25+
26+
Fatal error: Uncaught TypeError: Unsupported operand types: array + bool in %sassign_op_001.php:4
27+
Stack trace:
28+
#0 %sassign_op_001.php(10): test()
29+
#1 {main}
30+
thrown in %sassign_op_001.php on line 4

0 commit comments

Comments
 (0)