OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More regex memory leak fixes and tests.

This commit is contained in:
Ulrich Drepper 2010-10-11 22:46:44 -04:00
parent ef06edbee6
commit e9b9cbf5e9
4 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2010-10-11 Ulrich Drepper <drepper@gmail.com>
* posix/bug-regex31.c: Rewrite to run multiple tests from stdin.
* posix/bug-regex31.input: New file.
[BZ #12078]
* posix/regcomp.c (parse_branch): Free memory when allocation failed.
(parse_sub_exp): Fix last change, use postorder.
* posix/bug-regex31.c: New file.
* posix/Makefile: Add rules to build and run bug-regex31.

34
posix/bug-regex31.c
View File

@ -3,14 +3,34 @@
#include <stdio.h>
#include <sys/types.h>
int main()
int
main (void)
{
regex_t regex;
int rc;
mtrace ();
if ((rc = regcomp (&regex, "([0]", REG_EXTENDED)))
printf ("Error %d (expected)\n", rc);
return 0;
int res = 0;
char *buf = NULL;
size_t len = 0;
while (! feof (stdin))
{
ssize_t n = getline (&buf, &len, stdin);
if (n <= 0)
break;
if (buf[n - 1] == '\n')
buf[n - 1] = '\0';
regex_t regex;
int rc = regcomp (&regex, buf, REG_EXTENDED);
if (rc != 0)
printf ("%s: Error %d (expected)\n", buf, rc);
else
{
printf ("%s: succeeded !\n", buf);
res = 1;
}
}
free (buf);
return 0;
}

3
posix/bug-regex31.input Normal file
View File

@ -0,0 +1,3 @@
([0]
([0]a
([0]([0])

9
posix/regcomp.c
View File

@ -2164,12 +2164,15 @@ parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
}
if (tree != NULL && exp != NULL)
{
tree = create_tree (dfa, tree, exp, CONCAT);
if (tree == NULL)
bin_tree_t *newtree = create_tree (dfa, tree, exp, CONCAT);
if (newtree == NULL)
{
postorder (exp, free_tree, NULL);
postorder (tree, free_tree, NULL);
*err = REG_ESPACE;
return NULL;
}
tree = newtree;
}
else if (tree == NULL)
tree = exp;
@ -2420,7 +2423,7 @@ parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
{
if (tree != NULL)
free_tree (NULL, tree);
postorder (tree, free_tree, NULL);
*err = REG_EPAREN;
}
if (BE (*err != REG_NOERROR, 0))