marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernelbase: Fix PathAllocCanonicalize handling segments that contain dots. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47766
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit c13a8f60bd)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
Jeff Smith 2019-09-19 12:04:30 +08:00 committed by Michael Stefaniuc
parent 01ea6a5b63
commit 5278fb29ac
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/kernelbase/path.c
View File

@ -204,13 +204,8 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **
continue;
}
/* Keep the . if one of the following is true:
* 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS
* 2. in form of a..b
*/
if (dst > buffer
&& (((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS) && dst[-1] != '\\')
|| (dst[-1] != '\\' && src[2] != '\\' && src[2])))
/* Keep the .. if not surrounded by \ */
if ((src[2] != '\\' && src[2]) || (dst > buffer && dst[-1] != '\\'))
{
*dst++ = *src++;
*dst++ = *src++;
@ -241,14 +236,8 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **
}
else
{
/* Keep the . if one of the following is true:
* 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS
* 2. in form of a.b, which is used in domain names
* 3. *.
*/
if (dst > buffer
&& ((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS && dst[-1] != '\\')
|| (dst[-1] != '\\' && src[1] != '\\' && src[1]) || (dst[-1] == '*')))
/* Keep the . if not surrounded by \ */
if ((src[1] != '\\' && src[1]) || (dst > buffer && dst[-1] != '\\'))
{
*dst++ = *src++;
continue;
@ -280,6 +269,22 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **
/* End the path */
*dst = 0;
/* Strip multiple trailing . */
if (!(flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS))
{
while (dst > buffer && dst[-1] == '.')
{
/* Keep a . after * */
if (dst - 1 > buffer && dst[-2] == '*')
break;
/* If . follow a : at the second character, remove the . and add a \ */
else if (dst - 1 > buffer && dst[-2] == ':' && dst - 2 == buffer + 1)
*--dst = '\\';
else
*--dst = 0;
}
}
/* If result path is empty, fill in \ */
if (!*buffer)
{