Skip to content

Bound the LRUN page count in the zend_mm_gc() page scan (Zend/zend_al… #23773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jvoisin wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

Bound the LRUN page count in the zend_mm_gc() page scan (Zend/zend_al… #23773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Zend/zend_alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2311,8 +2311,13 @@ ZEND_API size_t zend_mm_gc(zend_mm_heap *heap)
chunk->map[i] = ZEND_MM_SRUN(bin_num);
}
i += bin_pages[bin_num];
} else /* if (info & ZEND_MM_IS_LRUN) */ {
i += ZEND_MM_LRUN_PAGES(info);
} else {
/* An allocated page is either an SRUN or an LRUN; a zeroed
* or corrupted map entry would otherwise stall the scan, as
* ZEND_MM_LRUN_PAGES(0) is 0 and would not advance i. */
uint32_t pages_count = ZEND_MM_LRUN_PAGES(info);
ZEND_MM_CHECK((info & ZEND_MM_IS_LRUN) && pages_count != 0, "zend_mm_heap corrupted");
i += pages_count;
}
} else {
i++;
Expand Down
Loading