Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework free list so that 0 is the placeholder.

Browse Source 
This is needed because in some configurations the constructor for the
global placeholder is not called before the first allocation (i.e. when
other globals call the allocator in their constructor) and so we ended
up following a null pointer.
This commit is contained in:
David Chisnall
2019-07-05 14:20:24 +01:00
parent 14b5c57b55
commit 2efcddfc3d
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mem/metaslab.h
View File

@@ -146,10 +146,10 @@ namespace snmalloc
{
#ifndef NDEBUG
size_t length = 0;
void* curr = pointer_offset(slab, head);
void* curr_slow = pointer_offset(slab, head);
void* curr = (head == 1) ? nullptr : pointer_offset(slab, head);
void* curr_slow = (head == 1) ? nullptr : pointer_offset(slab, head);
bool both = false;
while ((reinterpret_cast<size_t>(curr) & 1) == 0)
while (curr != nullptr)
{
curr = follow_next(curr);
if (both)
@@ -200,8 +200,8 @@ namespace snmalloc
UNUSED(length);
// Walk bump-free-list-segment accounting for unused space
void* curr = pointer_offset(slab, head);
while ((address_cast(curr) & 1) == 0)
void* curr = (head == 1) ? nullptr : pointer_offset(slab, head);
while (curr != nullptr)
{
// Check we are looking at a correctly aligned block
void* start = curr;