Resolve single dots in MakeAbsolute.

jpd002 · Jan 29, 2024 · de30a36 · de30a36
1 parent 4023122
commit de30a36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Source/iop/Iop_McServ.cpp b/Source/iop/Iop_McServ.cpp
@@ -134,6 +134,10 @@ std::string CMcServ::MakeAbsolutePath(const std::string& inputPath)
 	for(const auto& frag : frags)
 	{
 		if(frag.empty()) continue;
+		if(frag == ".")
+		{
+			continue;
+		}
 		if(frag == "..")
 		{
 			if(newFrags.empty())

diff --git a/tools/McServTest/tests/LOTR_ROTK.xml b/tools/McServTest/tests/LOTR_ROTK.xml
@@ -19,6 +19,9 @@
 		<Test Query="icon.sys" CurrentDirectory="../../../BASLUS-20770LOTRROTK" EnvironmentId="1" MaxEntries="1" Result="1">
 			<Entry Name="icon.sys" />
 		</Test>
+		<Test Query="icon.sys" CurrentDirectory="../BASLUS-20770LOTRROTK/././" EnvironmentId="1" MaxEntries="1" Result="1">
+			<Entry Name="icon.sys" />
+		</Test>
 		<Test Query="icon.sys" CurrentDirectory="dummy1/dummy2/../../BASLUS-20770LOTRROTK/" EnvironmentId="1" MaxEntries="1" Result="1">
 			<Entry Name="icon.sys" />
 		</Test>