mirrors/musl
0
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2024-11-23 18:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak in regexec when input contains illegal sequence

Browse Source 
(cherry picked from commit 546f6b322b)
This commit is contained in:
Szabolcs Nagy 2014-09-05 15:12:34 -04:00 committed by Rich Felker
parent 5a8c6f0932
commit 1d19a53b8c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/regex/regexec.c
View File

@ -52,7 +52,7 @@ tre_fill_pmatch(size_t nmatch, regmatch_t pmatch[], int cflags,
#define GET_NEXT_WCHAR() do { \
prev_c = next_c; pos += pos_add_next; \
if ((pos_add_next = mbtowc(&next_c, str_byte, MB_LEN_MAX)) <= 0) { \
if (pos_add_next < 0) return REG_NOMATCH; \
if (pos_add_next < 0) { ret = REG_NOMATCH; goto error_exit; } \
else pos_add_next++; \
} \
str_byte += pos_add_next; \
@ -181,6 +181,7 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
int reg_notbol = eflags & REG_NOTBOL;
int reg_noteol = eflags & REG_NOTEOL;
int reg_newline = tnfa->cflags & REG_NEWLINE;
reg_errcode_t ret;
char *buf;
tre_tnfa_transition_t *trans_i;
@ -439,11 +440,11 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
reach_next_i->state = NULL;
}
if (buf)
xfree(buf);
*match_end_ofs = match_eo;
return match_eo >= 0 ? REG_OK : REG_NOMATCH;
ret = match_eo >= 0 ? REG_OK : REG_NOMATCH;
error_exit:
xfree(buf);
return ret;
}