Fix handling of leading .. in simplify_path

Prior to this `..\..\texture.png` was incorrectly simplified to `texture.png` (cherry picked from commit 964e2b3)
Redot-Engine · Jan 18, 2025 · 736126b · 736126b
1 parent 31b13f3
commit 736126b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
@@ -4510,7 +4510,7 @@ String String::simplify_path() const {
 			dirs.remove_at(i);
 			i--;
 		} else if (d == "..") {
-			if (i != 0) {
+			if (i != 0 && dirs[i - 1] != "..") {
 				dirs.remove_at(i);
 				dirs.remove_at(i - 1);
 				i -= 2;

diff --git a/tests/core/string/test_string.h b/tests/core/string/test_string.h
@@ -1657,6 +1657,10 @@ TEST_CASE("[String] Path functions") {
 	for (int i = 0; i < 3; i++) {
 		CHECK(String(file_name[i]).is_valid_filename() == valid[i]);
 	}
+
+	CHECK(String("res://texture.png") == String("res://folder/../folder/../texture.png").simplify_path());
+	CHECK(String("res://texture.png") == String("res://folder/sub/../../texture.png").simplify_path());
+	CHECK(String("res://../../texture.png") == String("res://../../texture.png").simplify_path());
 }
 
 TEST_CASE("[String] hash") {