Skip to content

W
wine-winehq
Commit c13a8f60 authored by Jeff Smith's avatar Jeff Smith Committed by Alexandre Julliard
Browse files
Options

kernelbase: Fix PathAllocCanonicalize handling segments that contain dots.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47766Signed-off-by: 's avatarZhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: 's avatarJeff Smith <whydoubt@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e83f427a
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
dlls/kernelbase/path.c
View file @ c13a8f60
......@@ -276,13 +276,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++;
......@@ -313,14 +308,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;
......@@ -352,6 +341,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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment