glibc/patches/glibc-rh819430.patch

   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)
   5  # if HANDLE_MULTIBYTE
   6    if (__builtin_expect (MB_CUR_MAX, 1) != 1)
   7      {
   8 +      const char *orig_pattern = pattern;
   9        mbstate_t ps;
  10        size_t n;
  11        const char *p;
  12 @@ -356,10 +357,8 @@ fnmatch (pattern, string, flags)
  13                                                  alloca_used);
  14           n = mbsrtowcs (wpattern, &p, n + 1, &ps);
  15           if (__glibc_unlikely (n == (size_t) -1))
  16 -           /* Something wrong.
  17 -              XXX Do we have to set `errno' to something which mbsrtows hasn't
  18 -              already done?  */
  19 -           return -1;
  20 +           /* Something wrong: Fall back to single byte matching. */
  21 +           goto try_singlebyte;
  22           if (p)
  23             {
  24               memset (&ps, '\0', sizeof (ps));
  25 @@ -371,10 +370,8 @@ fnmatch (pattern, string, flags)
  26         prepare_wpattern:
  27           n = mbsrtowcs (NULL, &pattern, 0, &ps);
  28           if (__glibc_unlikely (n == (size_t) -1))
  29 -           /* Something wrong.
  30 -              XXX Do we have to set `errno' to something which mbsrtows hasn't
  31 -              already done?  */
  32 -           return -1;
  33 +           /*Something wrong: Fall back to single byte matching. */
  34 +           goto try_singlebyte;
  35           if (__glibc_unlikely (n >= (size_t) -1 / sizeof (wchar_t)))
  36             {
  37               __set_errno (ENOMEM);
  38 @@ -401,14 +398,8 @@ fnmatch (pattern, string, flags)
  39                                                 alloca_used);
  40           n = mbsrtowcs (wstring, &p, n + 1, &ps);
  41           if (__glibc_unlikely (n == (size_t) -1))
  42 -           {
  43 -             /* Something wrong.
  44 -                XXX Do we have to set `errno' to something which
  45 -                mbsrtows hasn't already done?  */
  46 -           free_return:
  47 -             free (wpattern_malloc);
  48 -             return -1;
  49 -           }
  50 +           /* Something wrong: Fall back to single byte matching. */
  51 +           goto free_and_try_singlebyte;
  52           if (p)
  53             {
  54               memset (&ps, '\0', sizeof (ps));
  55 @@ -420,10 +411,8 @@ fnmatch (pattern, string, flags)
  56         prepare_wstring:
  57           n = mbsrtowcs (NULL, &string, 0, &ps);
  58           if (__glibc_unlikely (n == (size_t) -1))
  59 -           /* Something wrong.
  60 -              XXX Do we have to set `errno' to something which mbsrtows hasn't
  61 -              already done?  */
  62 -           goto free_return;
  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)))
  66             {
  67               free (wpattern_malloc);
  68 @@ -450,6 +439,10 @@ fnmatch (pattern, string, flags)
  69        free (wpattern_malloc);
  70
  71        return res;
  72 +      free_and_try_singlebyte:
  73 +       free(wpattern_malloc);
  74 +      try_singlebyte:
  75 +       pattern = orig_pattern;
  76      }
  77  # endif  /* mbstate_t and mbsrtowcs or _LIBC.  */
  78