This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-464-g073f821
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Jun 2016 10:11:40 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-464-g073f821
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, master has been updated
via 073f82140c7dbd7af387153c29ac7ac3e882c4ef (commit)
from 983fd5c41ab7e5a5c33922259ca1ac99b3b413f8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=073f82140c7dbd7af387153c29ac7ac3e882c4ef
commit 073f82140c7dbd7af387153c29ac7ac3e882c4ef
Author: Florian Weimer <fweimer@redhat.com>
Date: Sat Jun 11 12:09:19 2016 +0200
malloc_usable_size: Use correct size for dumped fake mapped chunks
The adjustment for the size computation in commit
1e8a8875d69e36d2890b223ffe8853a8ff0c9512 is needed in
malloc_usable_size, too.
diff --git a/ChangeLog b/ChangeLog
index 4028db2..2989d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2016-06-11 Florian Weimer <fweimer@redhat.com>
+ * malloc/malloc.c (musable): Return correct size for dumped fake
+ mmapped chunk.
+
+2016-06-11 Florian Weimer <fweimer@redhat.com>
+
[BZ #20222]
* libio/iofopncook.c (_IO_cookie_read): Demangle callback pointer.
(_IO_cookie_write): Likewise.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index ac0f751..21a912a 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4622,7 +4622,12 @@ musable (void *mem)
return malloc_check_get_size (p);
if (chunk_is_mmapped (p))
- return chunksize (p) - 2 * SIZE_SZ;
+ {
+ if (DUMPED_MAIN_ARENA_CHUNK (p))
+ return chunksize (p) - SIZE_SZ;
+ else
+ return chunksize (p) - 2 * SIZE_SZ;
+ }
else if (inuse (p))
return chunksize (p) - SIZE_SZ;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
malloc/malloc.c | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources