[commits] r13188 - in /fsf/trunk/libc: ChangeLog NEWS posix/fnmatch.c sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Mar 19 00:03:15 2011
New Revision: 13188

Log:
Import glibc-mainline for 2011-03-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/posix/fnmatch.c
    fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Mar 19 00:03:15 2011
@@ -1,3 +1,16 @@
+2011-03-18  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12583]
+	* posix/fnmatch.c (fnmatch): Check size of pattern in wide
+	character representation.
+	Partly based on a patch by Tomas Hoger <thoger@xxxxxxxxxx>.
+
+2011-03-16  Ryan S. Arnold  <rsa@xxxxxxxxxx>
+
+	* sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S (isnanf): Fix
+	END(__isnan) to END(__isnanf) to match function entry point/label
+	EALIGN(__isnanf,...).
+
 2011-03-10  Jakub Jelinek  <jakub@xxxxxxxxxx>
 
 	* wcsmbs/wchar.h (wmemcmp): Remove __restrict qualifiers.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sat Mar 19 00:03:15 2011
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2011-3-10
+GNU C Library NEWS -- history of user-visible changes.  2011-3-18
 Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -9,7 +9,7 @@
 
 * The following bugs are resolved with this release:
 
-  11724, 12445, 12454, 12460, 12469, 12489, 12509, 12510
+  11724, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12583
 
 Version 2.13
 

Modified: fsf/trunk/libc/posix/fnmatch.c
==============================================================================
--- fsf/trunk/libc/posix/fnmatch.c (original)
+++ fsf/trunk/libc/posix/fnmatch.c Sat Mar 19 00:03:15 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010
+/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2007,2010,2011
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -375,6 +375,11 @@
 	       XXX Do we have to set `errno' to something which mbsrtows hasn't
 	       already done?  */
 	    return -1;
+	  if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
+	    {
+	      __set_errno (ENOMEM);
+	      return -2;
+	    }
 	  wpattern_malloc = wpattern
 	    = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));
 	  assert (mbsinit (&ps));
@@ -419,6 +424,12 @@
 	       XXX Do we have to set `errno' to something which mbsrtows hasn't
 	       already done?  */
 	    goto free_return;
+	  if (__builtin_expect (n >= (size_t) -1 / sizeof (wchar_t), 0))
+	    {
+	      free (wpattern_malloc);
+	      __set_errno (ENOMEM);
+	      return -2;
+	    }
 
 	  wstring_malloc = wstring
 	    = (wchar_t *) malloc ((n + 1) * sizeof (wchar_t));

Modified: fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S
==============================================================================
--- fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S (original)
+++ fsf/trunk/libc/sysdeps/powerpc/powerpc32/power6/fpu/s_isnanf.S Sat Mar 19 00:03:15 2011
@@ -1,5 +1,5 @@
 /* isnanf().  PowerPC32 version.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 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
@@ -39,8 +39,7 @@
 L(NaN):
 	li	r3,1		/* else return 1 */
 	blr
-	END (__isnan)
+	END (__isnanf)
 
 hidden_def (__isnanf)
 weak_alias (__isnanf, isnanf)
-