diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-01-30 18:41:47 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-01-30 18:41:47 +0000 |
| commit | 886d5973b793fbb53705db7754ebfb93c1224d26 (patch) | |
| tree | 11da76b3d9ac105fd9defd669e8cadbe19da6119 /malloc | |
| parent | 567678b68514f1673f5f856ca1f280addf38cb88 (diff) | |
| download | glibc-886d5973b793fbb53705db7754ebfb93c1224d26.tar.gz glibc-886d5973b793fbb53705db7754ebfb93c1224d26.tar.xz glibc-886d5973b793fbb53705db7754ebfb93c1224d26.zip | |
Update.
2002-10-07 Wolfram Gloger <wg@malloc.de> * malloc/malloc.c (sYSMALLOc): Only check for breakage due to foreign sbrk()'s if arena is contiguous. Bug report from Bruno Haible <bruno@clisp.org>. 2003-01-30 Jakub Jelinek <jakub@redhat.com> * sysdeps/s390/libc-tls.c: Include stdlib.h. 2003-01-30 Jakub Jelinek <jakub@redhat.com> * stdio-common/vfprintf.c (vfprintf): Only subtract lowest 3 bits of ps.__count. 2003-01-30 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Fix storing and restoring of %r6. * sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise. Use 64-bit load. Patch by Martin Schwidefsky <schwidefsky@de.ibm.com>. 2003-01-30 Jakub Jelinek <jakub@redhat.com> * elf/dl-reloc.c (CHECK_STATIC_TLS): Move _dl_signal_error... (allocate_static_tls): ...here. Add __attribute_noinline__. Don't return on failure. (_dl_reloc_bad_type): Add __attribute_noinline__. * elf/do-rel.h (elf_dynamic_do_rel): Add __attribute__((always_inline)). * elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative, elf_machine_lazy_rel): Add prototypes with __attribute__((always_inline)). 2003-01-29 David Mosberger <davidm@hpl.hp.com> * elf/dl-support.c (_dl_aux_init): Handle AT_SYSINFO.
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index da834d2663..4d1773a3b8 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2944,7 +2944,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; if (brk == old_end && snd_brk == (char*)(MORECORE_FAILURE)) set_head(old_top, (size + old_size) | PREV_INUSE); - else if (old_size && brk < old_end) { + else if (contiguous(av) && old_size && brk < old_end) { /* Oops! Someone else killed our space.. Can't touch anything. */ assert(0); } |