(public_cALLOc): For arena other than main_arena, count all bytes
authordrepper <drepper>
Mon, 17 Dec 2007 18:43:50 +0000 (18:43 +0000)
committerdrepper <drepper>
Mon, 17 Dec 2007 18:43:50 +0000 (18:43 +0000)
inside the mprotect_size range of the heap as uninitialized.

malloc/malloc.c

index c54c203..fc8a83c 100644 (file)
@@ -3886,6 +3886,12 @@ public_cALLOc(size_t n, size_t elem_size)
       oldtopsize < mp_.sbrk_base + av->max_system_mem - (char *)oldtop)
     oldtopsize = (mp_.sbrk_base + av->max_system_mem - (char *)oldtop);
 #endif
+  if (av != &main_arena)
+    {
+      heap_info *heap = heap_for_ptr (oldtop);
+      if (oldtopsize < (char *) heap + heap->mprotect_size - (char *) oldtop)
+       oldtopsize = (char *) heap + heap->mprotect_size - (char *) oldtop;
+    }
 #endif
   mem = _int_malloc(av, sz);