This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/pr14562/master created. glibc-2.16-ports-merge-318-g67d8758
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Sep 2012 18:29:02 -0000
- Subject: GNU C Library master sources branch hjl/pr14562/master created. glibc-2.16-ports-merge-318-g67d8758
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/pr14562/master has been created
at 67d875851e833ab93dd8aa5fb934e79d094da48d (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=67d875851e833ab93dd8aa5fb934e79d094da48d
commit 67d875851e833ab93dd8aa5fb934e79d094da48d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Sep 8 15:36:50 2012 -0700
Properly handle fencepost with MALLOC_ALIGN_MASK
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 <hongjiu.lu@intel.com>
+
+ [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 97c0b90..dd4f3e3 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -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;
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources