diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | config/srclist.txt | 2 | ||||
| -rw-r--r-- | lib/regexec.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2021-10-18 Paul Eggert <eggert@cs.ucla.edu> + + regex: fix buffer read overrrun + * lib/regexec.c (re_search_internal): + Fix buffer read overrun reported by Benno Schulenberg in: + https://lists.gnu.org/r/bug-gnulib/2021-10/msg00035.html + 2021-10-15 Paul Eggert <eggert@cs.ucla.edu> nproc: port better to macOS 10.14 diff --git a/config/srclist.txt b/config/srclist.txt index 16b61721aa..83e251def9 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -70,7 +70,7 @@ $LIBCSRC posix/regex.c lib $LIBCSRC posix/regex.h lib $LIBCSRC posix/regex_internal.c lib $LIBCSRC posix/regex_internal.h lib -$LIBCSRC posix/regexec.c lib +#$LIBCSRC posix/regexec.c lib #$LIBCSRC stdlib/canonicalize lib/canonicalize-lgpl.c #$LIBCSRC sysdeps/generic/eloop-threshold.h lib $LIBCSRC time/timegm.c lib diff --git a/lib/regexec.c b/lib/regexec.c index 83e9aaf8ca..a955aa2182 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -760,7 +760,7 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, } /* If MATCH_FIRST is out of the buffer, leave it as '\0'. Note that MATCH_FIRST must not be smaller than 0. */ - ch = (match_first >= length + ch = (mctx.input.valid_len <= offset ? 0 : re_string_byte_at (&mctx.input, offset)); if (fastmap[ch]) break; |