From: James Youngman <jay@gnu.org>
Date: Thu, 12 May 2011 21:14:11 +0000 (+0100)
Subject: fnmatch: sync glibc change fixing Bugzilla bug #12378
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bc30ce602212b9005e296602081138448691e79;p=pspp

fnmatch: sync glibc change fixing Bugzilla bug #12378

* lib/fnmatch_loop.c (FCT): When matching '[' keep track of
beginning and fall back to matching as normal character if the
string ends before the matching ']' is found.  This is what POSIX
requires.
---

diff --git a/ChangeLog b/ChangeLog
index a1745185d0..f5e33cb249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-11  Ulrich Drepper  <drepper@gmail.com>
+
+	Sync glibc change fixing Bugzilla bug #12378.
+	* lib/fnmatch_loop.c (FCT): When matching '[' keep track of
+	beginning and fall back to matching as normal character if the
+	string ends before the matching ']' is found.  This is what POSIX
+	requires.
+
 2011-05-13  Eric Blake  <eblake@redhat.com>
 
 	getcwd-lgpl: relax test for FreeBSD
diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c
index ed760dd8af..1fb246f0a2 100644
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -200,6 +200,8 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
         case L_('['):
           {
             /* Nonzero if the sense of the character class is inverted.  */
+            CHAR *p_init = p;
+            CHAR *n_init = n;
             register bool not;
             CHAR cold;
             UCHAR fn;
@@ -410,8 +412,13 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
                   }
 #endif
                 else if (c == L_('\0'))
-                  /* [ (unterminated) loses.  */
-                  return FNM_NOMATCH;
+                  {
+                    /* [ unterminated, treat as normal character.  */
+                    p = p_init;
+                    n = n_init;
+                    c = L_('[');
+                    goto normal_match;
+                  }
                 else
                   {
                     bool is_range = false;