php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 04:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source
This commit is contained in:
Nikita Popov
2019-09-24 12:19:14 +02:00
parent a369430b00 73115ef873
commit 3b52307c86
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Zend/tests/bug78589.phpt Normal file
View File

@@ -0,0 +1,19 @@
--TEST--
Bug #78589: Memory leak with GC + __destruct()
--FILE--
<?php
class Test {
public function __destruct() {}
}
$test = new Test;
$test->foo = [&$test->foo];
$ary = [&$ary, $test];
unset($ary, $test);
gc_collect_cycles();
?>
===DONE===
--EXPECT--
===DONE===

2
Zend/zend_gc.c
View File

@@ -1539,7 +1539,6 @@ ZEND_API int zend_gc_collect_cycles(void)
/* Destroy zvals */
GC_TRACE("Destroying zvals");
GC_G(gc_protected) = 1;
current = GC_IDX2PTR(GC_FIRST_ROOT);
last = GC_IDX2PTR(GC_G(first_unused));
while (current != last) {
@@ -1590,7 +1589,6 @@ ZEND_API int zend_gc_collect_cycles(void)
GC_TRACE("Collection finished");
GC_G(collected) += count;
GC_G(gc_protected) = 0;
GC_G(gc_active) = 0;
}