More regex memory leak fixes and tests.
This commit is contained in:
parent
ef06edbee6
commit
e9b9cbf5e9
|
@ -1,5 +1,12 @@
|
||||||
2010-10-11 Ulrich Drepper <drepper@gmail.com>
|
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/bug-regex31.c: New file.
|
||||||
* posix/Makefile: Add rules to build and run bug-regex31.
|
* posix/Makefile: Add rules to build and run bug-regex31.
|
||||||
|
|
||||||
|
|
|
@ -3,14 +3,34 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
int main()
|
int
|
||||||
|
main (void)
|
||||||
{
|
{
|
||||||
regex_t regex;
|
|
||||||
int rc;
|
|
||||||
|
|
||||||
mtrace ();
|
mtrace ();
|
||||||
|
|
||||||
if ((rc = regcomp (®ex, "([0]", REG_EXTENDED)))
|
int res = 0;
|
||||||
printf ("Error %d (expected)\n", rc);
|
char *buf = NULL;
|
||||||
return 0;
|
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 (®ex, 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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
([0]
|
||||||
|
([0]a
|
||||||
|
([0]([0])
|
|
@ -2164,12 +2164,15 @@ parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
|
||||||
}
|
}
|
||||||
if (tree != NULL && exp != NULL)
|
if (tree != NULL && exp != NULL)
|
||||||
{
|
{
|
||||||
tree = create_tree (dfa, tree, exp, CONCAT);
|
bin_tree_t *newtree = create_tree (dfa, tree, exp, CONCAT);
|
||||||
if (tree == NULL)
|
if (newtree == NULL)
|
||||||
{
|
{
|
||||||
|
postorder (exp, free_tree, NULL);
|
||||||
|
postorder (tree, free_tree, NULL);
|
||||||
*err = REG_ESPACE;
|
*err = REG_ESPACE;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
tree = newtree;
|
||||||
}
|
}
|
||||||
else if (tree == NULL)
|
else if (tree == NULL)
|
||||||
tree = exp;
|
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 (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
|
||||||
{
|
{
|
||||||
if (tree != NULL)
|
if (tree != NULL)
|
||||||
free_tree (NULL, tree);
|
postorder (tree, free_tree, NULL);
|
||||||
*err = REG_EPAREN;
|
*err = REG_EPAREN;
|
||||||
}
|
}
|
||||||
if (BE (*err != REG_NOERROR, 0))
|
if (BE (*err != REG_NOERROR, 0))
|
||||||
|
|
Loading…
Reference in New Issue