diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-01-21 11:08:13 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-01-31 13:18:56 -0800 |
| commit | 583dd860d5b833037175247230a328f0050dbfe9 (patch) | |
| tree | 8d281e86b18cddbb98a89a6b8c4ec20dbf2f8e93 | |
| parent | 2bac7daa58da1a313bd452369b0508b31e146637 (diff) | |
| download | glibc-583dd860d5b833037175247230a328f0050dbfe9.tar.gz glibc-583dd860d5b833037175247230a328f0050dbfe9.tar.xz glibc-583dd860d5b833037175247230a328f0050dbfe9.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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | posix/regexec.c | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 05e13e65f0..62d732e6e7 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-01-31 Florian Weimer <fweimer@redhat.com> [BZ #24059] @@ -18002,7 +18010,7 @@ (CFLAGS-wcstof_l.c): Likewise. (CPPFLAGS-tst-wchar-h.c): Likewise. (CPPFLAGS-wcstold_l.c): Likewise. ---- + 2017-12-11 Paul A. Clarke <pc@us.ibm.com> * sysdeps/ieee754/flt-32/s_cosf.c: New implementation. 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; } } |