Bug 1659: Relative long paths are not handled correctly

https://winscp.net/tracker/1659 Source commit: 20c5802e3fa677c83e78bc3cb37fa1b46a63bdf2
winscp · Jul 5, 2018 · 1f21f57 · 1f21f57
1 parent ed0b0ad
commit 1f21f57
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/source/core/Common.cpp b/source/core/Common.cpp
@@ -1144,6 +1144,13 @@ UnicodeString __fastcall MakeUnicodeLargePath(UnicodeString Path)
 //---------------------------------------------------------------------------
 UnicodeString __fastcall ApiPath(UnicodeString Path)
 {
+  UnicodeString Drive = ExtractFileDrive(Path);
+  // This may match even a path like "C:" or "\\server\\share", but we do not really care
+  if (Drive.IsEmpty() || (Path.SubString(Drive.Length() + 1, 1) != L"\\"))
+  {
+    Path = ExpandFileName(Path);
+  }
+
   if (Path.Length() >= MAX_PATH)
   {
     if (Configuration != NULL)