summaryrefslogtreecommitdiff
path: root/posix
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2015-02-26 14:55:24 +0100
committerAndreas Schwab <schwab@suse.de>2015-02-26 16:05:08 +0100
commit4a28f4d55a6cc33474c0792fe93b5942d81bf185 (patch)
treeeda443d1e0a8eb431f21f472c96c3ea89d7d0b69 /posix
parent524ae9ea2e3ae9f5bf5d655595fda827e9dc50a1 (diff)
downloadglibc-4a28f4d55a6cc33474c0792fe93b5942d81bf185.tar.gz
Fix read past end of pattern in fnmatch (bug 18032)
Diffstat (limited to 'posix')
-rw-r--r--posix/fnmatch_loop.c5
-rw-r--r--posix/tst-fnmatch3.c8
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 ()