Tue Apr 2 21:27:01 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
authorroland <roland>
Wed, 3 Apr 1996 16:27:08 +0000 (16:27 +0000)
committerroland <roland>
Wed, 3 Apr 1996 16:27:08 +0000 (16:27 +0000)
* posix/glob.c (glob_pattern_p): Avoid scanning past eos if
the pattern ends with a backslash and quoting is enabled.
* posix/fnmatch.c (fnmatch): Likewise; return FNM_NOMATCH for such
  patterns.

posix/fnmatch.c
posix/glob.c

index 1ddea80..08c1c94 100644 (file)
@@ -78,6 +78,9 @@ fnmatch (pattern, string, flags)
          if (!(flags & FNM_NOESCAPE))
            {
              c = *p++;
+             if (c == '\0')
+               /* Trailing \ loses.  */
+               return FNM_NOMATCH;
              c = FOLD (c);
            }
          if (FOLD (*n) != c)
@@ -129,7 +132,11 @@ fnmatch (pattern, string, flags)
                register char cstart = c, cend = c;
 
                if (!(flags & FNM_NOESCAPE) && c == '\\')
-                 cstart = cend = *p++;
+                 {
+                   if (*p == '\0')
+                     return FNM_NOMATCH;
+                   cstart = cend = *p++;
+                 }
 
                cstart = cend = FOLD (cstart);
 
@@ -176,8 +183,12 @@ fnmatch (pattern, string, flags)
 
                c = *p++;
                if (!(flags & FNM_NOESCAPE) && c == '\\')
-                 /* XXX 1003.2d11 is unclear if this is right.  */
-                 ++p;
+                 {
+                   if (*p == '\0')
+                     return FNM_NOMATCH;
+                   /* XXX 1003.2d11 is unclear if this is right.  */
+                   ++p;
+                 }
              }
            if (not)
              return FNM_NOMATCH;
index eea126d..1a00af6 100644 (file)
@@ -699,7 +699,7 @@ glob_pattern_p (pattern, quote)
        return 1;
 
       case '\\':
-       if (quote)
+       if (quote && p[1] != '\0')
          ++p;
        break;