archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix garbage marking in gc_collect_roots()

Browse source 
gc_collect_white() will mark white nodes as black and add them as
garbage, but only if it's not buffered yet. The already buffered
roots are instead marked as garbage in gc_collect_roots() directly.
However, if gc_collect_white() marked a (buffered) root as black
through recursion, it would not subsequently be marked as garbage.
This commit is contained in:
Nikita Popov 2018-03-06 23:09:31 +01:00
parent dcbac8ade6
commit 3b5b64ce75
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Zend/zend_gc.c
View file

@ -1167,11 +1167,10 @@ static int gc_collect_roots(uint32_t *flags)
while (idx != end) { while (idx != end) {
current = GC_IDX2PTR(idx); current = GC_IDX2PTR(idx);
ref = current->ref; ref = current->ref;
if (GC_IS_ROOT(ref)) { ZEND_ASSERT(GC_IS_ROOT(ref));
if (GC_REF_CHECK_COLOR(ref, GC_WHITE)) { current->ref = GC_MAKE_GARBAGE(ref);
current->ref = GC_MAKE_GARBAGE(ref); if (GC_REF_CHECK_COLOR(ref, GC_WHITE)) {
count += gc_collect_white(ref, flags); count += gc_collect_white(ref, flags);
}
} }
idx++; idx++;
} }