diff options
| author | Andreas Schwab <schwab@suse.de> | 2015-02-26 14:55:24 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-07-20 23:24:24 -0400 |
| commit | 5af500db3c6abef8810253e51d428b406f24320d (patch) | |
| tree | 1514024c02db2806cd00c61f24081eaa504dcc66 | |
| parent | 1c416311f5d92922788c1bef42de5b9ccd812bac (diff) | |
| download | glibc-5af500db3c6abef8810253e51d428b406f24320d.tar glibc-5af500db3c6abef8810253e51d428b406f24320d.tar.gz glibc-5af500db3c6abef8810253e51d428b406f24320d.tar.bz2 glibc-5af500db3c6abef8810253e51d428b406f24320d.zip | |
Fix read past end of pattern in fnmatch (bug 18032)
(cherry picked from commit 4a28f4d55a6cc33474c0792fe93b5942d81bf185)
(cherry picked from commit fe7b1136e5753c85b3ccc8395dfc66b82052d73c)
| -rw-r--r-- | posix/fnmatch_loop.c | 5 | ||||
| -rw-r--r-- | posix/tst-fnmatch3.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c index c0cb2fc3e6..72c5d8f041 100644 --- a/posix/fnmatch_loop.c +++ b/posix/fnmatch_loop.c @@ -945,14 +945,13 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used) } else if (c == L('[') && *p == L('.')) { - ++p; while (1) { c = *++p; - if (c == '\0') + if (c == L('\0')) return FNM_NOMATCH; - if (*p == L('.') && p[1] == L(']')) + if (c == L('.') && p[1] == L(']')) break; } p += 2; diff --git a/posix/tst-fnmatch3.c b/posix/tst-fnmatch3.c index d27a557c7c..75bc00a2c5 100644 --- a/posix/tst-fnmatch3.c +++ b/posix/tst-fnmatch3.c @@ -21,9 +21,11 @@ int do_test (void) { - const char *pattern = "[[:alpha:]'[:alpha:]\0]"; - - return fnmatch (pattern, "a", 0) != FNM_NOMATCH; + if (fnmatch ("[[:alpha:]'[:alpha:]\0]", "a", 0) != FNM_NOMATCH) + return 1; + if (fnmatch ("[a[.\0.]]", "a", 0) != FNM_NOMATCH) + return 1; + return 0; } #define TEST_FUNCTION do_test () |