AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-04 19:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle fencepost with MALLOC_ALIGN_MASK

Browse Source
This commit is contained in:
H.J. Lu 2012-09-08 15:36:50 -07:00
parent 3d9b46b350
commit 67d875851e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.pr14562 Normal file
View File

@ -0,0 +1,5 @@
2012-09-08 H.J. Lu <hongjiu.lu@intel.com>
[BZ #14562]
* malloc/arena.c (heap_trim): Properly get fencepost and adjust
new chunk size with MALLOC_ALIGN_MASK.

7
malloc/arena.c
View File

@ -655,15 +655,18 @@ heap_trim(heap_info *heap, size_t pad)
unsigned long pagesz = GLRO(dl_pagesize);
mchunkptr top_chunk = top(ar_ptr), p, bck, fwd;
heap_info *prev_heap;
long new_size, top_size, extra;
long new_size, top_size, extra, misalign;
/* Can this heap go away completely? */
while(top_chunk == chunk_at_offset(heap, sizeof(*heap))) {
prev_heap = heap->prev;
p = chunk_at_offset(prev_heap, prev_heap->size - (MINSIZE-2*SIZE_SZ));
/* fencepost must be properly aligned. */
misalign = ((long) p) & MALLOC_ALIGN_MASK;
p = (mchunkptr)(((unsigned long) p) & ~MALLOC_ALIGN_MASK);
assert(p->size == (0|PREV_INUSE)); /* must be fencepost */
p = prev_chunk(p);
new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ);
new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ) + misalign;
assert(new_size>0 && new_size<(long)(2*MINSIZE));
if(!prev_inuse(p))
new_size += p->prev_size;