]> granicus.if.org Git - php/commitdiff
fix #69628: complex GLOB_BRACE fails on Windows
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 13 May 2015 21:47:54 +0000 (23:47 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 13 May 2015 21:47:54 +0000 (23:47 +0200)
win32/glob.c

index 43884509ce9c8dd71b0dc2fb57c860d4eeb1b61c..1541fcf96665911c020880513e104de0d6fa94eb 100644 (file)
@@ -293,17 +293,19 @@ globexp2(ptr, pattern, pglob, rv)
        }
 
        for (i = 0, pl = pm = ptr; pm <= pe; pm++) {
+               const Char *pb;
+
                switch (*pm) {
                case LBRACKET:
                        /* Ignore everything between [] */
-                       for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++)
+                       for (pb = pm++; *pm != RBRACKET && *pm != EOS; pm++)
                                ;
                        if (*pm == EOS) {
                                /*
                                 * We could not find a matching RBRACKET.
                                 * Ignore and just look for RBRACE
                                 */
-                               pm = pl;
+                               pm = pb;
                        }
                        break;