diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-03-24 08:19:18 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-03-24 08:19:18 +0000 |
| commit | 55a24b753a4f6e03ed23e16b2be847bd5c5642a7 (patch) | |
| tree | c72d70578f8305f1cfedc9a24507d12c45a5ff1c /malloc | |
| parent | dfaef65dcfc165ef88957b7b4633499cbf612299 (diff) | |
| download | glibc-55a24b753a4f6e03ed23e16b2be847bd5c5642a7.tar.gz glibc-55a24b753a4f6e03ed23e16b2be847bd5c5642a7.tar.xz glibc-55a24b753a4f6e03ed23e16b2be847bd5c5642a7.zip | |
Updated to fedora-glibc-20050324T0715 cvs/fedora-glibc-2_3_4-17
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 44831bbb1d..65be277097 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1,4 +1,4 @@ - /* Malloc implementation for multiple threads without lock contention. +/* Malloc implementation for multiple threads without lock contention. Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger <wg@malloc.de> @@ -3691,14 +3691,14 @@ public_cALLOc(size_t n, size_t elem_size) /* Two optional cases in which clearing not necessary */ #if HAVE_MMAP - if (chunk_is_mmapped(p)) + if (perturb_byte == 0 && chunk_is_mmapped(p)) return mem; #endif csz = chunksize(p); #if MORECORE_CLEARS - if (p == oldtop && csz > oldtopsize) { + if (perturb_byte == 0 && (p == oldtop && csz > oldtopsize)) { /* clear only the bytes from non-freshly-sbrked memory */ csz = oldtopsize; } |