|
 |
00db10 |
commit 4a28f4d55a6cc33474c0792fe93b5942d81bf185
|
|
|
00db10 |
Author: Andreas Schwab <schwab@suse.de>
|
|
|
00db10 |
Date: Thu Feb 26 14:55:24 2015 +0100
|
|
|
00db10 |
|
|
|
00db10 |
Fix read past end of pattern in fnmatch (bug 18032)
|
|
|
00db10 |
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/posix/fnmatch_loop.c glibc-2.17-c758a686/posix/fnmatch_loop.c
|
|
|
00db10 |
index c0cb2fc..72c5d8f 100644
|
|
|
00db10 |
--- glibc-2.17-c758a686/posix/fnmatch_loop.c
|
|
|
00db10 |
+++ glibc-2.17-c758a686/posix/fnmatch_loop.c
|
|
|
00db10 |
@@ -945,14 +945,13 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
|
|
|
00db10 |
}
|
|
|
00db10 |
else if (c == L('[') && *p == L('.'))
|
|
|
00db10 |
{
|
|
|
00db10 |
- ++p;
|
|
|
00db10 |
while (1)
|
|
|
00db10 |
{
|
|
|
00db10 |
c = *++p;
|
|
|
00db10 |
- if (c == '\0')
|
|
|
00db10 |
+ if (c == L('\0'))
|
|
|
00db10 |
return FNM_NOMATCH;
|
|
|
00db10 |
|
|
|
00db10 |
- if (*p == L('.') && p[1] == L(']'))
|
|
|
00db10 |
+ if (c == L('.') && p[1] == L(']'))
|
|
|
00db10 |
break;
|
|
|
00db10 |
}
|
|
|
00db10 |
p += 2;
|
|
|
00db10 |
diff --git glibc-2.17-c758a686/posix/tst-fnmatch3.c glibc-2.17-c758a686/posix/tst-fnmatch3.c
|
|
|
00db10 |
index d27a557..75bc00a 100644
|
|
|
00db10 |
--- glibc-2.17-c758a686/posix/tst-fnmatch3.c
|
|
|
00db10 |
+++ glibc-2.17-c758a686/posix/tst-fnmatch3.c
|
|
|
00db10 |
@@ -21,9 +21,11 @@
|
|
|
00db10 |
int
|
|
|
00db10 |
do_test (void)
|
|
|
00db10 |
{
|
|
|
00db10 |
- const char *pattern = "[[:alpha:]'[:alpha:]\0]";
|
|
|
00db10 |
-
|
|
|
00db10 |
- return fnmatch (pattern, "a", 0) != FNM_NOMATCH;
|
|
|
00db10 |
+ if (fnmatch ("[[:alpha:]'[:alpha:]\0]", "a", 0) != FNM_NOMATCH)
|
|
|
00db10 |
+ return 1;
|
|
|
00db10 |
+ if (fnmatch ("[a[.\0.]]", "a", 0) != FNM_NOMATCH)
|
|
|
00db10 |
+ return 1;
|
|
|
00db10 |
+ return 0;
|
|
|
00db10 |
}
|
|
|
00db10 |
|
|
|
00db10 |
#define TEST_FUNCTION do_test ()
|