diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-24 12:19:14 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-24 12:19:14 +0200 |
| commit | 3b52307c862dbb187ed06d844a67f5626030945c (patch) | |
| tree | 722eccc97550916713c8675a2a3cd3de4dc65a6f | |
| parent | a369430b00ce8dfb3b7c07f40520dda369012ef2 (diff) | |
| parent | 73115ef8730cc2466fdb039acb6b9463bc08808a (diff) | |
| download | php-git-3b52307c862dbb187ed06d844a67f5626030945c.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | Zend/tests/bug78589.phpt | 19 | ||||
| -rw-r--r-- | Zend/zend_gc.c | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/Zend/tests/bug78589.phpt b/Zend/tests/bug78589.phpt new file mode 100644 index 0000000000..ac4761f794 --- /dev/null +++ b/Zend/tests/bug78589.phpt @@ -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=== diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index 0d80eb68ee..496d855d31 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -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; } |