summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2015-05-13 23:47:54 +0200
committerAnatol Belski <ab@php.net>2015-05-21 09:44:15 +0200
commit8c6e8e787023e0a5fb43a9fad98e454a222fb3d5 (patch)
treebbd47ab86a353b49cde3ec25a26025e5b3555240
parent90aee01c85c8958f2bf7f89660c0b1a446bcb6eb (diff)
downloadphp-git-8c6e8e787023e0a5fb43a9fad98e454a222fb3d5.tar.gz
fix #69628: complex GLOB_BRACE fails on Windows
-rw-r--r--win32/glob.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/win32/glob.c b/win32/glob.c
index 8111daba1c..a61c4f3ef0 100644
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -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;