kernelbase: Fix PathAllocCanonicalize handling segments that contain dots.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47766Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Fix PathAllocCanonicalize handling segments that contain dots.
c13a8f60 · Jeff Smith · Alexandre Julliard · e83f427a · c13a8f60
Commit c13a8f60 authored Sep 19, 2019 by Jeff Smith Committed by Alexandre Julliard Sep 19, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 15 deletions

path.c dlls/kernelbase/path.c +20 -15

No files found.
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -276,13 +276,8 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **
                    continue;
                }
-                /* Keep the . if one of the following is true:
+                /* Keep the .. if not surrounded by \ */
-                 * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS
+                if ((src[2] != '\\' && src[2]) || (dst > buffer && dst[-1] != '\\'))
-                 * 2. in form of a..b
-                 */
-                if (dst > buffer
-                    && (((flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS) && dst[-1] != '\\')
-                        || (dst[-1] != '\\' && src[2] != '\\' && src[2])))
                {
                    *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:
+                /* Keep the . if not surrounded by \ */
-                 * 1. PATHCCH_DO_NOT_NORMALIZE_SEGMENTS
+                if ((src[1] != '\\' && src[1]) || (dst > buffer && dst[-1] != '\\'))
-                 * 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] == '*')))
                {
                    *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)
    {