This commit is contained in:
Nikita Popov 2016-08-05 16:27:55 +02:00
parent 03d03243fa
commit fc7c81ff54
3 changed files with 27 additions and 3 deletions

4
NEWS
View file

@ -9,6 +9,10 @@ PHP NEWS
. Fixed bug #72711 (`mb_ereg` does not clear the `$regs` parameter on
failure). (ju1ius)
- Opcache:
. Fixed bug #72762 (Infinite loop while parsing a file with opcache enabled).
(Nikita)
- Stream:
. Fixed bug #72743 (Out-of-bound read in php_stream_filter_create).
(Loianhtuan)

View file

@ -3139,9 +3139,6 @@ static void zend_update_type_info(const zend_op_array *op_array,
if (t1 & MAY_BE_ARRAY_KEY_STRING) {
tmp |= MAY_BE_STRING;
}
if (!(tmp & (MAY_BE_LONG|MAY_BE_STRING))) {
tmp |= MAY_BE_NULL;
}
}
UPDATE_SSA_TYPE(tmp, ssa_ops[i].result_def);
}

View file

@ -0,0 +1,23 @@
--TEST--
Bug #72762: Infinite loop while parsing a file with opcache enabled
--FILE--
<?php
class foo
{
function bar()
{
$b = array();
foreach ($a as $a) {
foreach ($b as $k => $v) {
}
$b[$k] = $v;
}
}
}
?>
===DONE===
--EXPECT--
===DONE===