Fix issue #1923: Save function doesn't work if the path length exceed…

…s 248 characters
WinMerge · Jun 30, 2023 · 3c2e135 · 3c2e135
1 parent 0c719bf
commit 3c2e135
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/Src/paths.cpp b/Src/paths.cpp
@@ -738,10 +738,20 @@ String GetPathOnly(const String& fullpath)
 	return spath;
 }
 
-bool IsURL(const String& path)
+bool IsURL(const String& abspath)
 {
-	size_t pos = path.find(':');
-	return (pos != String::npos && pos > 1);
+	for (size_t i = 0; i < abspath.length(); ++i)
+	{
+		const auto c = abspath[i];
+		if (c == '\\' || c == '/')
+		{
+			// If there is a \ or / before the : character, consider it not a URL.
+			return false;
+		}
+		else if (c == ':')
+			return (i != 1);
+	}
+	return false;
 }
 
 bool IsURLorCLSID(const String& path)

diff --git a/Testing/GoogleTest/Paths/paths_test.cpp b/Testing/GoogleTest/Paths/paths_test.cpp
@@ -395,4 +395,12 @@ namespace
 		EXPECT_FALSE(paths::IsPathAbsolute(_T("cde\\abd")));
 	}
 
+	TEST_F(PathTest, IsURL)
+	{
+		EXPECT_FALSE(paths::IsURL(_T("C:\\file.txt")));
+		EXPECT_FALSE(paths::IsURL(_T("\\\\?\\C:\\file.txt")));
+		EXPECT_FALSE(paths::IsURL(_T("\\\\server\\file.txt")));
+		EXPECT_TRUE(paths::IsURL(_T("https://server/")));
+	}
+
 }  // namespace