mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-24 12:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1'

Browse Source 
* PHP-8.1:
  Start new block after loop free
This commit is contained in:
Nikita Popov 2021-10-04 17:02:40 +02:00
commit d1aff29a04
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/Optimizer/zend_cfg.c
View File

@ -437,6 +437,9 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
case ZEND_FE_FREE: case ZEND_FE_FREE:
if (zend_optimizer_is_loop_var_free(opline)) { if (zend_optimizer_is_loop_var_free(opline)) {
BB_START(i); BB_START(i);
if (i + 1 < op_array->last) {
BB_START(i + 1);
}
flags |= ZEND_FUNC_FREE_LOOP_VAR; flags |= ZEND_FUNC_FREE_LOOP_VAR;
} }
break; break;

18
Zend/tests/match/045.phpt Normal file
View File

@ -0,0 +1,18 @@
--TEST--
Corrupted CFG due to unreachable free with match
--FILE--
<?php
function test() {
var_dump(match(x){});
match(y){
3, 4 => 5,
};
}
try {
test();
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
Undefined constant "x"