Correctly handle /./../ sequences in toAbsPath

burningrooftop · Jan 31, 2024 · 391fda7 · 391fda7
1 parent 5c718b7
commit 391fda7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/osfiles.s7i b/lib/osfiles.s7i
@@ -766,6 +766,7 @@ const func string: toAbsPath (in string: basePath, in string: path) is func
     else
       absolutePath := getcwd & "/" & basePath & "/" & path;
     end if;
+    absolutePath := replace(absolutePath, "/./", "/");
     dotdotPos := pos(absolutePath, "/..");
     while dotdotPos <> 0 do
       slashPos := rpos(absolutePath, '/', pred(dotdotPos));
@@ -787,7 +788,6 @@ const func string: toAbsPath (in string: basePath, in string: path) is func
         dotdotPos := pos(absolutePath, "/..", succ(dotdotPos));
       end if;
     end while;
-    absolutePath := replace(absolutePath, "/./", "/");
     if endsWith(absolutePath, "/.") then
       if absolutePath = "/." then
         absolutePath := "/";