From: Anatol Belski <ab@php.net>
Date: Fri, 22 Jul 2016 15:04:33 +0000 (+0200)
Subject: don't return long path prefix to script
X-Git-Tag: php-7.1.0beta2~86^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d83324105c86c75282cfbd343597c547b924b7f;p=php

don't return long path prefix to script
---

diff --git a/win32/ioutil.c b/win32/ioutil.c
index 768239ca2d..ee298e7d80 100644
--- a/win32/ioutil.c
+++ b/win32/ioutil.c
@@ -488,7 +488,11 @@ PW32IO size_t php_win32_ioutil_dirname(char *path, size_t len)
 	*(endw+1) = L'\0';
 
 	ret_len = (endw + 1 - startw);
-	ret = php_win32_ioutil_conv_w_to_any(startw, ret_len, &ret_len);
+	if (PHP_WIN32_IOUTIL_IS_LONG_PATHW(startw, ret_len)) {
+		ret = php_win32_ioutil_conv_w_to_any(startw + PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW, ret_len - PHP_WIN32_IOUTIL_LONG_PATH_PREFIX_LENW, &ret_len);
+	} else {
+		ret = php_win32_ioutil_conv_w_to_any(startw, ret_len, &ret_len);
+	}
 	memmove(start, ret, ret_len+1);
 	assert(start[ret_len] == '\0');
 	free(ret);