From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 10 Sep 2004 19:56:41 +0000 (+0000)
Subject: nt_free): Only do arena boundary check for contiguous arenas.
X-Git-Tag: cvs/fedora-base~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e00177e5a53c83916f8e0edc6d77d8c2a7fdbfb;p=thirdparty%2Fglibc.git

nt_free): Only do arena boundary check for contiguous arenas.
---

diff --git a/malloc/malloc.c b/malloc/malloc.c
index 0d0990cc357..665d7a4b3e3 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4229,8 +4229,9 @@ _int_free(mstate av, Void_t* mem)
       if (__builtin_expect (p == av->top, 0))
 	goto double_free;
       /* Or whether the next chunk is beyond the boundaries of the arena.  */
-      if (__builtin_expect ((char *) nextchunk >= ((char *) av->top
-						   + chunksize(av->top)), 0))
+      if (__builtin_expect (contiguous (av)
+			    && (char *) nextchunk
+			       >= ((char *) av->top + chunksize(av->top)), 0))
 	goto double_free;
       /* Or whether the block is actually not marked used.  */
       if (__builtin_expect (!prev_inuse(nextchunk), 0))