diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-01-21 11:08:13 -0800 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2019-03-16 23:26:14 +0100 |
| commit | 4d0b1b0f61bfba034e9e76a1d76acc59c975238f (patch) | |
| tree | dc889fa514c5190604fc3e516b112b3c61eab6cc | |
| parent | bc6f839fb4066be83272c735e662850af2595777 (diff) | |
| download | glibc-4d0b1b0f61bfba034e9e76a1d76acc59c975238f.tar.gz glibc-4d0b1b0f61bfba034e9e76a1d76acc59c975238f.tar.xz glibc-4d0b1b0f61bfba034e9e76a1d76acc59c975238f.zip | |
regex: fix read overrun [BZ #24114]
Problem found by AddressSanitizer, reported by Hongxu Chen in: https://debbugs.gnu.org/34140 * posix/regexec.c (proceed_next_node): Do not read past end of input buffer. (cherry picked from commit 583dd860d5b833037175247230a328f0050dbfe9)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | posix/regexec.c | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 90558e434c..fb88626efe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-01-31 Paul Eggert <eggert@cs.ucla.edu> + + regex: fix read overrun [BZ #24114] + Problem found by AddressSanitizer, reported by Hongxu Chen in: + https://debbugs.gnu.org/34140 + * posix/regexec.c (proceed_next_node): + Do not read past end of input buffer. + 2019-03-13 Stefan Liebler <stli@linux.ibm.com> * elf/dl-sysdep.c (_dl_show_auxv): Remove condition and always diff --git a/posix/regexec.c b/posix/regexec.c index 91d5a797b8..084b1222d9 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, else if (naccepted) { char *buf = (char *) re_string_get_buffer (&mctx->input); - if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, - naccepted) != 0) + if (mctx->input.valid_len - *pidx < naccepted + || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, + naccepted) + != 0)) return -1; } } |