OSDN Git Service

Cherrypick upstream fnmatch.c fix.
authorElliott Hughes <enh@google.com>
Mon, 3 Aug 2015 18:11:22 +0000 (11:11 -0700)
committerElliott Hughes <enh@google.com>
Mon, 3 Aug 2015 18:11:22 +0000 (11:11 -0700)
Bug: http://b/22855370
Change-Id: I3865cff1e2ffeb6709cea092be3770c1bebf1623

libc/upstream-openbsd/lib/libc/gen/fnmatch.c

index e83dc43..0d0f18f 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: fnmatch.c,v 1.18 2014/12/11 16:25:34 millert Exp $    */
+/*     $OpenBSD: fnmatch.c,v 1.19 2015/08/01 18:11:08 millert Exp $    */
 
 /* Copyright (c) 2011, VMware, Inc.
  * All rights reserved.
@@ -192,6 +192,8 @@ static int fnmatch_ch(const char **pattern, const char **string, int flags)
                 result = 0;
                 continue;
             }
+            if (!**pattern)
+                break;
 
 leadingclosebrace:
             /* Look at only well-formed range patterns;