mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Fix memory leak after GC inside a foreach loop (#12572)
This commit is contained in:
Dmitry Stogov 2023-10-30 23:36:50 +03:00
commit 004d8951ce
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Zend/tests/gc_047.phpt Normal file
View File

@ -0,0 +1,20 @@
--TEST--
GC 047: Leak after GC inside a foreach loop
--INI--
zend.enable_gc=1
--FILE--
<?php
$a = [0, 1];
foreach($a as &$v) {
$a[0] =& $a;
$a[1] = array();
$a[1][0] =& $a[1];
$b = 1;
$a =& $b;
gc_collect_cycles();
break;
}
var_dump(gc_collect_cycles());
?>
--EXPECT--
int(2)

2
Zend/zend_gc.c
View File

@ -2052,7 +2052,7 @@ static void zend_gc_root_tmpvars(void) {
}
uint32_t kind = range->var & ZEND_LIVE_MASK;
if (kind == ZEND_LIVE_TMPVAR) {
if (kind == ZEND_LIVE_TMPVAR || kind == ZEND_LIVE_LOOP) {
uint32_t var_num = range->var & ~ZEND_LIVE_MASK;
zval *var = ZEND_CALL_VAR(ex, var_num);
if (Z_REFCOUNTED_P(var)) {