system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

regexec.c: avoid leaks on out-of-memory failure paths

Browse Source
This commit is contained in:
Paul Eggert 2010-01-22 12:33:58 -08:00 committed by Ulrich Drepper
parent 42a2c9b5c3
commit 74bc9f14db
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-01-22 Jim Meyering <jim@meyering.net> 2010-01-22 Jim Meyering <jim@meyering.net>
[BZ #11192]
* posix/regexec.c (re_copy_regs): Don't leak when allocation
of the start buffer succeeds but allocation of the "end" one fails.
[BZ #11191] [BZ #11191]
* posix/regexec.c (re_search_2_stub): Check for overflow * posix/regexec.c (re_search_2_stub): Check for overflow
when adding the sizes of the two strings. when adding the sizes of the two strings.

19
posix/regexec.c
View File

@ -509,9 +509,14 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated)
if (regs_allocated == REGS_UNALLOCATED) if (regs_allocated == REGS_UNALLOCATED)
{ /* No. So allocate them with malloc. */ { /* No. So allocate them with malloc. */
regs->start = re_malloc (regoff_t, need_regs); regs->start = re_malloc (regoff_t, need_regs);
regs->end = re_malloc (regoff_t, need_regs); if (BE (regs->start == NULL, 0))
if (BE (regs->start == NULL, 0) || BE (regs->end == NULL, 0))
return REGS_UNALLOCATED; return REGS_UNALLOCATED;
regs->end = re_malloc (regoff_t, need_regs);
if (BE (regs->end == NULL, 0))
{
re_free (regs->start);
return REGS_UNALLOCATED;
}
regs->num_regs = need_regs; regs->num_regs = need_regs;
} }
else if (regs_allocated == REGS_REALLOCATE) else if (regs_allocated == REGS_REALLOCATE)
@ -521,9 +526,15 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated)
if (BE (need_regs > regs->num_regs, 0)) if (BE (need_regs > regs->num_regs, 0))
{ {
regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs); regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs);
regoff_t *new_end = re_realloc (regs->end, regoff_t, need_regs); regoff_t *new_end;
if (BE (new_start == NULL, 0) || BE (new_end == NULL, 0)) if (BE (new_start == NULL, 0))
return REGS_UNALLOCATED; return REGS_UNALLOCATED;
new_end = re_realloc (regs->end, regoff_t, need_regs);
if (BE (new_end == NULL, 0))
{
re_free (new_start);
return REGS_UNALLOCATED;
}
regs->start = new_start; regs->start = new_start;
regs->end = new_end; regs->end = new_end;
regs->num_regs = need_regs; regs->num_regs = need_regs;