upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

regex: fix double-free

Browse Source 
* lib/regex_internal.c (re_dfa_add_node): Don’t free storage
twice if an allocation fails.
This commit is contained in:
Paul Eggert
2022-03-11 17:23:53 -08:00
committed by Bruno Haible
parent d85d2084d4
commit d74b28d08f
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2022-03-11 Paul Eggert <eggert@cs.ucla.edu>
regex: fix double-free
* lib/regex_internal.c (re_dfa_add_node): Don’t free storage
twice if an allocation fails.
regex: fix minor over-allocation
* lib/regexec.c (push_fail_stack): Fix off-by-one error that
over-allocated the stack.
lib/regex_internal.c
+10 -12
View File
@@ -1396,24 +1396,22 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
if (__glibc_unlikely (new_nodes == NULL))
return -1;
dfa->nodes = new_nodes;
dfa->nodes_alloc = new_nodes_alloc;
new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
if (new_nexts != NULL)
dfa->nexts = new_nexts;
new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc);
if (new_indices != NULL)
dfa->org_indices = new_indices;
new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);
if (new_edests != NULL)
dfa->edests = new_edests;
new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc);
if (new_eclosures != NULL)
dfa->eclosures = new_eclosures;
if (__glibc_unlikely (new_nexts == NULL || new_indices == NULL
|| new_edests == NULL || new_eclosures == NULL))
{
re_free (new_nexts);
re_free (new_indices);
re_free (new_edests);
re_free (new_eclosures);
return -1;
}
dfa->nexts = new_nexts;
dfa->org_indices = new_indices;
dfa->edests = new_edests;
dfa->eclosures = new_eclosures;
dfa->nodes_alloc = new_nodes_alloc;
return -1;
}
dfa->nodes[dfa->nodes_len] = token;
dfa->nodes[dfa->nodes_len].constraint = 0;