🐛 Fix ../ in paths displaying incorrectly

Fixes #19
Komposten · Jul 15, 2019 · 5144ba6 · 5144ba6
1 parent 86f2d84
commit 5144ba6
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/komposten/vivaldi/ui/InstructionTable.java b/src/main/java/komposten/vivaldi/ui/InstructionTable.java
@@ -229,13 +229,21 @@ private Instruction fixInstructionPaths(Instruction original)
 				String result = prefix + dir;
 
 				int navUpIndex;
-				while ((navUpIndex = result.indexOf("../")) != -1)
+				int startIndex = 0;
+				while ((navUpIndex = result.indexOf("../", startIndex)) != -1)
 				{
-					int previousSlash = result.lastIndexOf('/', navUpIndex);
-
-					if (previousSlash != -1)
+					int previousSlash = result.lastIndexOf('/', navUpIndex-2);
+
+					if (previousSlash != -1 && previousSlash >= startIndex)
+					{
 						result = result.substring(0, previousSlash)
 								+ result.substring(navUpIndex + 2);
+						startIndex = 0;
+					}
+					else
+					{
+						startIndex = navUpIndex+1;
+					}
 				}
 
 				return new Instruction(src, result, original.excludeFromBrowserHtml);