diff mbox

malloc_usable_size: Use correct size for dumped fake mapped chunks

Message ID 20160610080507.19218400EE785@oldenburg.str.redhat.com
State New
Headers show

Commit Message

Florian Weimer June 10, 2016, 8:05 a.m. UTC
The adjustment for the size computation in commit
1e8a8875d69e36d2890b223ffe8853a8ff0c9512 is needed in
malloc_usable_size, too.

2016-06-10  Florian Weimer  <fweimer@redhat.com>

	* malloc/malloc.c (musable): Return correct size for dumped fake
	mmapped chunk.

Comments

Paul Eggert June 10, 2016, 10:25 p.m. UTC | #1
Thanks, this looks good too.
diff mbox

Patch

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 6f77d37..a077335 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4608,7 +4608,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;
     }