From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 17 Dec 2007 18:44:04 +0000 (+0000)
Subject: * malloc/malloc.c (public_cALLOc): For arena other than
X-Git-Tag: cvs/fedora-glibc-20071227T0908~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cd4c5d6a28c4fbdc86651c4578f4c4f24efce08;p=thirdparty%2Fglibc.git

* malloc/malloc.c (public_cALLOc): For arena other than

	main_arena, count all bytes inside the mprotect_size range of the
	heap as uninitialized.
---

diff --git a/ChangeLog b/ChangeLog
index c728e04016b..4c238519816 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* malloc/malloc.c (public_cALLOc): For arena other than
+	main_arena, count all bytes inside the mprotect_size range of the
+	heap as uninitialized.
+
 2007-12-16  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/tst-execstack.c (do_test): Don't fail if SELinux forbids
diff --git a/malloc/malloc.c b/malloc/malloc.c
index c54c203cbf1..fc8a83c3286 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -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);