* malloc/malloc.c (do_check_chunk): Correct check for mmaped block

	not overlapping with arena.

diff --git a/ChangeLog b/ChangeLog
index d5e1de39cd866163c20ef39980102033fec2190a..5413c12889e2f8735e448051b0baed840a3eefa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-05-18  Ulrich Drepper  <drepper@redhat.com>
 
+       * malloc/malloc.c (do_check_chunk): Correct check for mmaped block
+       not overlapping with arena.
+
        * malloc/mcheck.c (reallochook): If size==0, free the block.
 
        * rt/tst-shm.c: Use fstat64 instead of fstat.

diff --git a/malloc/malloc.c b/malloc/malloc.c
index e061db94d67b53209f1083146424340f9b4f4f34..d37d920cd13a2fe829eb5891ac13a02b27788782 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -2572,7 +2572,7 @@ static void do_check_chunk(av, p) mstate av; mchunkptr p;
 #if HAVE_MMAP
     /* address is outside main heap  */
     if (contiguous(av) && av->top != initial_top(av)) {
-      assert(((char*)p) < min_address || ((char*)p) > max_address);
+      assert(((char*)p) < min_address || ((char*)p) >= max_address);
     }
     /* chunk is page-aligned */
     assert(((p->prev_size + sz) & (mp_.pagesize-1)) == 0);

diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index 4e0d4b5b7df3fc47646fdcbedb30f158d5251369..524acc755c5dd49c2fdde75e7ace40e987c46ef9 100644 (file)
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -267,7 +267,7 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
   if (size == 0)
     {
       freehook (ptr, caller);
-      return;
+      return NULL;
     }
 
   struct hdr *hdr;