From: Jakub Jelinek Date: Fri, 19 Nov 2004 06:38:37 +0000 (+0000) Subject: chunksize(x) => x->size X-Git-Tag: cvs/fedora-glibc-2_3_3-81~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=802ea9dccd5871d65513488d9ce9e3f0a8021177;p=thirdparty%2Fglibc.git chunksize(x) => x->size --- diff --git a/malloc/malloc.c b/malloc/malloc.c index ca7c7e59bc9..c2ec82d0c84 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -4233,7 +4233,7 @@ _int_free(mstate av, Void_t* mem) #endif ) { - if (__builtin_expect (chunksize (chunk_at_offset (p, size)) <= 2 * SIZE_SZ, + if (__builtin_expect (chunk_at_offset (p, size)->size <= 2 * SIZE_SZ, 0) || __builtin_expect (chunksize (chunk_at_offset (p, size)) >= av->system_mem, 0)) @@ -4285,7 +4285,7 @@ _int_free(mstate av, Void_t* mem) } nextsize = chunksize(nextchunk); - if (__builtin_expect (nextsize <= 2 * SIZE_SZ, 0) + if (__builtin_expect (nextchunk->size <= 2 * SIZE_SZ, 0) || __builtin_expect (nextsize >= av->system_mem, 0)) { errstr = "invalid next size (normal)";