diff options
| author | Andreas Schwab <schwab@suse.de> | 2015-02-26 14:55:24 +0100 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2016-02-25 16:02:35 -0300 |
| commit | eda498975dd49f616d8af26e5224ca39c8feeb8c (patch) | |
| tree | 698b99584fa56d865ec4f570bc1f97ce91bb38f7 | |
| parent | 6ef92b982aef69f05a3faa481c34699bfa55f1dd (diff) | |
| download | glibc-eda498975dd49f616d8af26e5224ca39c8feeb8c.tar.gz glibc-eda498975dd49f616d8af26e5224ca39c8feeb8c.tar.xz glibc-eda498975dd49f616d8af26e5224ca39c8feeb8c.zip | |
Fix read past end of pattern in fnmatch (bug 18032)
(cherry picked from commit 4a28f4d55a6cc33474c0792fe93b5942d81bf185) Conflicts: NEWS
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | posix/fnmatch_loop.c | 5 | ||||
| -rw-r--r-- | posix/tst-fnmatch3.c | 8 |
4 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index a4917cd239..4a45f60428 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-02-25 Andreas Schwab <schwab@suse.de> + + [BZ #18032] + * posix/fnmatch_loop.c (FCT): Remove extra increment when skipping + over collating symbol inside a bracket expression. Minor cleanup. + * posix/tst-fnmatch3.c (do_test): Add test case. + 2016-02-25 Paul Pluzhnikov <ppluzhnikov@google.com> [BZ #17269] diff --git a/NEWS b/NEWS index 57a7f11b1f..9392e32845 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ Version 2.20.1 * The following bugs are resolved with this release: 16009, 16617, 16618, 17266, 17269, 17370, 17371, 17460, 17485, 17555, - 17625, 17630, 17801, 18694, 18928, 19018. + 17625, 17630, 17801, 18032, 18694, 18928, 19018. * The LD_POINTER_GUARD environment variable can no longer be used to disable the pointer guard feature. It is always enabled. diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c index db6d9d7c56..f09b7ce5f0 100644 --- a/posix/fnmatch_loop.c +++ b/posix/fnmatch_loop.c @@ -940,14 +940,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 2a83c1bfb7..e03e478ca2 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 () |