From 5362c04ba6d076dd02b990f98270b6e20a65f7df Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 8 Sep 2012 15:36:50 -0700 Subject: Properly handle fencepost with MALLOC_ALIGN_MASK --- ChangeLog.pr14562 | 5 +++++ malloc/arena.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 ChangeLog.pr14562 diff --git a/ChangeLog.pr14562 b/ChangeLog.pr14562 new file mode 100644 index 0000000..b92843d --- /dev/null +++ b/ChangeLog.pr14562 @@ -0,0 +1,5 @@ +2012-09-08 H.J. Lu + + [BZ #14562] + * malloc/arena.c (heap_trim): Properly get fencepost and adjust + new chunk size with MALLOC_ALIGN_MASK. diff --git a/malloc/arena.c b/malloc/arena.c index 33c4ff3..399c1e4 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -652,15 +652,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; -- cgit v1.1