godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-20 14:45:44 +00:00
Code Releases Wiki Activity

Fix handling of leading .. in simplify_path

Browse Source 
Prior to this `..\..\texture.png` was incorrectly simplified to `texture.png`
This commit is contained in:
demolke
2024-12-05 23:23:53 +01:00
parent eb5103093c
commit 964e2b3a9e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/string/ustring.cpp
View File

@@ -4608,7 +4608,7 @@ String String::simplify_path() const {
dirs.remove_at(i); dirs.remove_at(i);
i--; i--;
} else if (d == "..") { } else if (d == "..") {
if (i != 0) { if (i != 0 && dirs[i - 1] != "..") {
dirs.remove_at(i); dirs.remove_at(i);
dirs.remove_at(i - 1); dirs.remove_at(i - 1);
i -= 2; i -= 2;

4
tests/core/string/test_string.h
View File

@@ -1687,6 +1687,10 @@ TEST_CASE("[String] Path functions") {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
CHECK(String(file_name[i]).is_valid_filename() == valid[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") { TEST_CASE("[String] hash") {