Fix a xallocx(..., MALLOCX_ZERO) bug.
Fix xallocx(..., MALLOCX_ZERO to zero the last full trailing page of
large allocations that have been randomly assigned an offset of 0 when
--enable-cache-oblivious configure option is enabled. This addresses a
special case missed in d260f442ce
(Fix
xallocx(..., MALLOCX_ZERO) bugs.).
This commit is contained in:
12
src/arena.c
12
src/arena.c
@@ -2683,10 +2683,16 @@ arena_ralloc_large_grow(arena_t *arena, arena_chunk_t *chunk, void *ptr,
|
||||
/*
|
||||
* Zero the trailing bytes of the original allocation's
|
||||
* last page, since they are in an indeterminate state.
|
||||
* There will always be trailing bytes, because ptr's
|
||||
* offset from the beginning of the run is a multiple of
|
||||
* CACHELINE in [0 .. PAGE).
|
||||
*/
|
||||
assert(PAGE_CEILING(oldsize) == oldsize);
|
||||
memset((void *)((uintptr_t)ptr + oldsize), 0,
|
||||
PAGE_CEILING((uintptr_t)ptr) - (uintptr_t)ptr);
|
||||
void *zbase = (void *)((uintptr_t)ptr + oldsize);
|
||||
void *zpast = PAGE_ADDR2BASE((void *)((uintptr_t)zbase +
|
||||
PAGE));
|
||||
size_t nzero = (uintptr_t)zpast - (uintptr_t)zbase;
|
||||
assert(nzero > 0);
|
||||
memset(zbase, 0, nzero);
|
||||
}
|
||||
|
||||
size = oldsize + splitsize;
|
||||
|
Reference in New Issue
Block a user