From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 9 May 2004 19:01:13 +0000 (+0000)
Subject: Fixed bug #28289 (incorrect resolving of relative paths by glob() in
X-Git-Tag: RELEASE_0_1~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=468e834ef1366ce51ff002bc84fe2e976073b082;p=php

Fixed bug #28289 (incorrect resolving of relative paths by glob() in
windows).
---

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 0d9bdfb90b..4609d15d67 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -379,11 +379,13 @@ PHP_FUNCTION(glob)
 		if (!result) {
 			cwd[0] = '\0';
 		}
-		cwd_skip = strlen(cwd)+1;
 #ifdef PHP_WIN32
-		if (IS_SLASH(cwd[0]) && !IS_UNC_PATH(pattern, pattern_len)) {
+		if (!IS_SLASH(cwd[0])) {
 			cwd[2] = '\0';
+			cwd_skip = 3;
 		}
+#else
+		cwd_skip = strlen(cwd)+1;
 #endif
 		snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, pattern);
 		pattern = work_pattern;