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)
This commit is contained in:
parent
bc6f839fb4
commit
4d0b1b0f61
|
@ -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>
|
2019-03-13 Stefan Liebler <stli@linux.ibm.com>
|
||||||
|
|
||||||
* elf/dl-sysdep.c (_dl_show_auxv): Remove condition and always
|
* elf/dl-sysdep.c (_dl_show_auxv): Remove condition and always
|
||||||
|
|
|
@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
|
||||||
else if (naccepted)
|
else if (naccepted)
|
||||||
{
|
{
|
||||||
char *buf = (char *) re_string_get_buffer (&mctx->input);
|
char *buf = (char *) re_string_get_buffer (&mctx->input);
|
||||||
if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
|
if (mctx->input.valid_len - *pidx < naccepted
|
||||||
naccepted) != 0)
|
|| (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
|
||||||
|
naccepted)
|
||||||
|
!= 0))
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue