1 diff -Nrup a/posix/fnmatch.c b/posix/fnmatch.c
2 --- a/posix/fnmatch.c 2012-01-01 07:16:32.000000000 -0500
3 +++ b/posix/fnmatch.c 2012-05-23 14:14:29.099461189 -0400
4 @@ -333,6 +333,7 @@ fnmatch (pattern, string, flags)
6 if (__builtin_expect (MB_CUR_MAX, 1) != 1)
8 + const char *orig_pattern = pattern;
12 @@ -356,10 +357,8 @@ fnmatch (pattern, string, flags)
14 n = mbsrtowcs (wpattern, &p, n + 1, &ps);
15 if (__glibc_unlikely (n == (size_t) -1))
17 - XXX Do we have to set `errno' to something which mbsrtows hasn't
20 + /* Something wrong: Fall back to single byte matching. */
21 + goto try_singlebyte;
24 memset (&ps, '\0', sizeof (ps));
25 @@ -371,10 +370,8 @@ fnmatch (pattern, string, flags)
27 n = mbsrtowcs (NULL, &pattern, 0, &ps);
28 if (__glibc_unlikely (n == (size_t) -1))
30 - XXX Do we have to set `errno' to something which mbsrtows hasn't
33 + /*Something wrong: Fall back to single byte matching. */
34 + goto try_singlebyte;
35 if (__glibc_unlikely (n >= (size_t) -1 / sizeof (wchar_t)))
38 @@ -401,14 +398,8 @@ fnmatch (pattern, string, flags)
40 n = mbsrtowcs (wstring, &p, n + 1, &ps);
41 if (__glibc_unlikely (n == (size_t) -1))
44 - XXX Do we have to set `errno' to something which
45 - mbsrtows hasn't already done? */
47 - free (wpattern_malloc);
50 + /* Something wrong: Fall back to single byte matching. */
51 + goto free_and_try_singlebyte;
54 memset (&ps, '\0', sizeof (ps));
55 @@ -420,10 +411,8 @@ fnmatch (pattern, string, flags)
57 n = mbsrtowcs (NULL, &string, 0, &ps);
58 if (__glibc_unlikely (n == (size_t) -1))
60 - XXX Do we have to set `errno' to something which mbsrtows hasn't
63 + /* Something wrong: Fall back to singlebyte matching. */
64 + goto free_and_try_singlebyte;
65 if (__glibc_unlikely (n >= (size_t) -1 / sizeof (wchar_t)))
67 free (wpattern_malloc);
68 @@ -450,6 +439,10 @@ fnmatch (pattern, string, flags)
69 free (wpattern_malloc);
72 + free_and_try_singlebyte:
73 + free(wpattern_malloc);
75 + pattern = orig_pattern;
77 # endif /* mbstate_t and mbsrtowcs or _LIBC. */