about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-10-12 09:00:33 -0400
committerUlrich Drepper <drepper@redhat.com>2010-10-12 09:00:33 -0400
commitb833d51fbbf78b38c6ff68074c22d3fe3ddd0ce3 (patch)
tree860e5ed3a07d6d0f7a540b610ce50b74195cb39e
parente9b9cbf5e9bdcda6f0b50456658bac748202dd70 (diff)
downloadglibc-b833d51fbbf78b38c6ff68074c22d3fe3ddd0ce3.tar.gz
glibc-b833d51fbbf78b38c6ff68074c22d3fe3ddd0ce3.tar.xz
glibc-b833d51fbbf78b38c6ff68074c22d3fe3ddd0ce3.zip
One more regex memory leak fixed.
-rw-r--r--ChangeLog6
-rw-r--r--posix/bug-regex31.input1
-rw-r--r--posix/regcomp.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 219236465c..e2a4a70517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-12  Ulrich Drepper  <drepper@redhat.com>
+
+	[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@gmail.com>
 
 	* posix/bug-regex31.c: Rewrite to run multiple tests from stdin.
diff --git a/posix/bug-regex31.input b/posix/bug-regex31.input
index eea961ccf5..3d1f531f4e 100644
--- a/posix/bug-regex31.input
+++ b/posix/bug-regex31.input
@@ -1,3 +1,4 @@
+[[][
 ([0]
 ([0]a
 ([0]([0])
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 4ee7b90ace..b238c08225 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -2160,6 +2160,8 @@ parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
       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)