diff options
| author | Anatol Belski <ab@php.net> | 2015-05-21 09:47:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-21 09:47:30 +0200 |
| commit | fc94fb3e5b91abcbf539643e3b960e02ab1bf180 (patch) | |
| tree | 746d634e4b4c00e8d3bbd1a6809b5f407e895f5a /win32 | |
| parent | ad4d022bdf23b087b0d2c84e4941706755467d89 (diff) | |
| parent | c507c533bd1c34f1c71b4ffd5f14869776533cc3 (diff) | |
| download | php-git-fc94fb3e5b91abcbf539643e3b960e02ab1bf180.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
added missing GLOB_BRACE support check
added SKIPIF section to test to make sure that GLOB_BRACE is supported
fix #69628: complex GLOB_BRACE fails on Windows
added PHPT to check for bug #69628
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/glob.c | 6 |
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; |