[commits] r14488 - in /fsf/trunk/libc: ChangeLog malloc/hooks.c stdlib/tst-strtod.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Jul  9 00:02:29 2011
New Revision: 14488

Log:
Import glibc-mainline for 2011-07-09

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/malloc/hooks.c
    fsf/trunk/libc/stdlib/tst-strtod.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Jul  9 00:02:29 2011
@@ -1,3 +1,13 @@
+2011-07-08  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* malloc/hooks.c (memalign_check): Avoid using checked_request2size
+	if the result is not used.
+
+2011-07-05  Andreas Jaeger  <aj@xxxxxxx>
+
+	[BZ#9696]
+	* stdlib/tst-strtod.c: Add testcase.
+
 2011-07-07  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/pathconf.c (distinguish_extX): New function.

Modified: fsf/trunk/libc/malloc/hooks.c
==============================================================================
--- fsf/trunk/libc/malloc/hooks.c (original)
+++ fsf/trunk/libc/malloc/hooks.c Sat Jul  9 00:02:29 2011
@@ -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@xxxxxxxxx>, 2001.
 
@@ -398,7 +398,6 @@
      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 @@
     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;

Modified: fsf/trunk/libc/stdlib/tst-strtod.c
==============================================================================
--- fsf/trunk/libc/stdlib/tst-strtod.c (original)
+++ fsf/trunk/libc/stdlib/tst-strtod.c Sat Jul  9 00:02:29 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1996-2001,2003,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1996-2001,2003,2009,2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -72,6 +72,7 @@
     { "+InFiNiTy", HUGE_VAL, '\0', 0 },
 #endif
     { "0x80000Ap-23", 0x80000Ap-23, '\0', 0 },
+    { "1e-324", 0, '\0', ERANGE },
     { NULL, 0, '\0', 0 }
   };