about summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-06-11 12:09:19 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-06-11 12:09:19 +0200
commit073f82140c7dbd7af387153c29ac7ac3e882c4ef (patch)
tree9fbb2c23eccc4fd63e44da46fa389c2e4bf50e50 /malloc
parent983fd5c41ab7e5a5c33922259ca1ac99b3b413f8 (diff)
downloadglibc-073f82140c7dbd7af387153c29ac7ac3e882c4ef.tar.gz
glibc-073f82140c7dbd7af387153c29ac7ac3e882c4ef.tar.xz
glibc-073f82140c7dbd7af387153c29ac7ac3e882c4ef.zip
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.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/malloc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index ac0f751593..21a912a6d1 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;
     }