From: Ulrich Drepper <drepper@gmail.com>
Date: Fri, 8 Jul 2011 17:20:41 +0000 (-0400)
Subject: (memalign_check): No need to use checked_request2size.
X-Git-Tag: upstream/2.20~5249
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8538fdb3ec7c8899cbc5dbbce4a3fbfe7cf8c2a1;p=platform%2Fupstream%2Flinaro-glibc.git

(memalign_check): No need to use checked_request2size.
---

diff --git a/ChangeLog b/ChangeLog
index d47995b..7480493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-08  Ulrich Drepper  <drepper@gmail.com>
+
+	* malloc/hooks.c (memalign_check): Avoid using checked_request2size
+	if the result is not used.
+
 2011-07-05  Andreas Jaeger  <aj@suse.de>
 
 	[BZ#9696]
diff --git a/malloc/hooks.c b/malloc/hooks.c
index 28845ee..4b1a996 100644
--- a/malloc/hooks.c
+++ b/malloc/hooks.c
@@ -1,5 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 2001-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
 
@@ -398,7 +398,6 @@ memalign_check(alignment, bytes, caller)
      size_t alignment; size_t bytes; const Void_t *caller;
 #endif
 {
-  INTERNAL_SIZE_T nb;
   Void_t* mem;
 
   if (alignment <= MALLOC_ALIGNMENT) return malloc_check(bytes, NULL);
@@ -408,7 +407,6 @@ memalign_check(alignment, bytes, caller)
     MALLOC_FAILURE_ACTION;
     return NULL;
   }
-  checked_request2size(bytes+1, nb);
   (void)mutex_lock(&main_arena.mutex);
   mem = (top_check() >= 0) ? _int_memalign(&main_arena, alignment, bytes+1) :
     NULL;