[commits] r11753 - in /fsf/trunk/libc: ChangeLog posix/bug-regex31.input posix/regcomp.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Oct 12 08:41:26 2010
New Revision: 11753

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

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/posix/bug-regex31.input
    fsf/trunk/libc/posix/regcomp.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Oct 12 08:41:26 2010
@@ -1,3 +1,9 @@
+2010-10-12  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #12078]
+	* posix/regcomp.c (parse_branch): One more memory leak plugged.
+	* posix/bug-regex31.input: Add test case.
+
 2010-10-11  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* posix/bug-regex31.c: Rewrite to run multiple tests from stdin.

Modified: fsf/trunk/libc/posix/bug-regex31.input
==============================================================================
--- fsf/trunk/libc/posix/bug-regex31.input (original)
+++ fsf/trunk/libc/posix/bug-regex31.input Tue Oct 12 08:41:26 2010
@@ -1,3 +1,4 @@
+[[][
 ([0]
 ([0]a
 ([0]([0])

Modified: fsf/trunk/libc/posix/regcomp.c
==============================================================================
--- fsf/trunk/libc/posix/regcomp.c (original)
+++ fsf/trunk/libc/posix/regcomp.c Tue Oct 12 08:41:26 2010
@@ -2160,6 +2160,8 @@
       exp = parse_expression (regexp, preg, token, syntax, nest, err);
       if (BE (*err != REG_NOERROR && exp == NULL, 0))
 	{
+	  if (tree != NULL)
+	    postorder (tree, free_tree, NULL);
 	  return NULL;
 	}
       if (tree != NULL && exp != NULL)