diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/malloc.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c728e04016..4c23851981 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 c54c203cbf..fc8a83c328 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); |