From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 27 Jan 2003 18:32:36 +0000 (+0000)
Subject: (mem2chunk_check): Check alignment of mem pointer, not of the computed chunk.
X-Git-Tag: cvs/glibc-2_3_2~251
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=371a11f3d732a2025f026e9a2a09567301dc7bae;p=thirdparty%2Fglibc.git

(mem2chunk_check): Check alignment of mem pointer, not of the computed chunk.
---

diff --git a/malloc/hooks.c b/malloc/hooks.c
index 0bd3e2a9ca1..cf6642c9300 100644
--- a/malloc/hooks.c
+++ b/malloc/hooks.c
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 2001,02 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
 
@@ -162,8 +162,8 @@ mem2chunk_check(mem) Void_t* mem;
   INTERNAL_SIZE_T sz, c;
   unsigned char magic;
 
+  if(!aligned_OK(mem)) return NULL;
   p = mem2chunk(mem);
-  if(!aligned_OK(p)) return NULL;
   if( (char*)p>=mp_.sbrk_base &&
       (char*)p<(mp_.sbrk_base+main_arena.system_mem) ) {
     /* Must be a chunk in conventional heap memory. */