summary refs log tree commit diff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-01-30 17:47:23 +0000
committerUlrich Drepper <drepper@redhat.com>2009-01-30 17:47:23 +0000
commit1fdd89a78dfa4f0ea4b14c994a055de802e61a89 (patch)
treefb50205adf4fe547c4056a9d4731ef6a1170135f /malloc/malloc.c
parent8585cb7454e10346bccc9fb4df3fae51b2efb9b6 (diff)
downloadglibc-1fdd89a78dfa4f0ea4b14c994a055de802e61a89.tar.gz
glibc-1fdd89a78dfa4f0ea4b14c994a055de802e61a89.tar.xz
glibc-1fdd89a78dfa4f0ea4b14c994a055de802e61a89.zip
* malloc/malloc.c (sYSMALLOc): Don't use assert when detecting
	manipulated brk, use malloc_printerr.
	* misc/sbrk.c (__sbrk): Better error handling for nonsense
	requests.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index d6102a4528..a918934740 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 1996-2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>
    and Doug Lea <dl@cs.oswego.edu>, 2001.
@@ -3189,7 +3189,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
 
     else if (contiguous(av) && old_size && brk < old_end) {
       /* Oops!  Someone else killed our space..  Can't touch anything.  */
-      assert(0);
+      malloc_printerr (3, "break adjusted to free malloc space", brk);
     }
 
     /*