[commits] r12414 - in /fsf/trunk/libc: ChangeLog NEWS posix/regexec.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Dec 28 00:03:08 2010
New Revision: 12414

Log:
Import glibc-mainline for 2010-12-28

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/posix/regexec.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Dec 28 00:03:08 2010
@@ -1,3 +1,9 @@
+2010-12-27  Jim Meyering  <meyering@xxxxxxxxxx>
+
+	[BZ #12348]
+	* posix/regexec.c (build_trtable): Return failure indication upon
+	calloc failure.  Otherwise, re_search_internal could infloop on OOM.
+
 2010-12-25  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	[BZ #12201]

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Dec 28 00:03:08 2010
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes.  2010-12-26
+GNU C Library NEWS -- history of user-visible changes.  2010-12-27
 Copyright (C) 1992-2009, 2010 Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -12,7 +12,7 @@
   3268, 7066, 10085, 10851, 11149, 11611, 11640, 11655, 11701, 11840, 11856,
   11883, 11903, 11904, 11968, 11979, 12005, 12037, 12067, 12077, 12078, 12092,
   12093, 12107, 12108, 12113, 12140, 12159, 12167, 12191, 12194, 12201, 12204,
-  12205, 12207
+  12205, 12207, 12348
 
 * New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
 

Modified: fsf/trunk/libc/posix/regexec.c
==============================================================================
--- fsf/trunk/libc/posix/regexec.c (original)
+++ fsf/trunk/libc/posix/regexec.c Tue Dec 28 00:03:08 2010
@@ -3373,6 +3373,8 @@
 	{
 	  state->trtable = (re_dfastate_t **)
 	    calloc (sizeof (re_dfastate_t *), SBC_MAX);
+	  if (BE (state->trtable == NULL, 0))
+	    return 0;
 	  return 1;
 	}
       return 0;