GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix bug in StringUtils::PathRemoveRelativeParts when going up to the Windows drive with relative path bits

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-04 11:54:55 +02:00
parent 05ffaf7cef
commit 1c12e3d530
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Engine/Platform/Base/StringUtilsBase.cpp
View File

@@ -337,18 +337,23 @@ void StringUtils::PathRemoveRelativeParts(String& path)
path.Split(TEXT('/'), components);
Array<String, InlinedAllocation<16>> stack;
for (auto& bit : components)
for (String& bit : components)
{
if (bit == TEXT(".."))
{
if (stack.HasItems())
{
auto popped = stack.Pop();
String popped = stack.Pop();
const int32 windowsDriveStart = popped.Find('\\');
if (popped == TEXT(".."))
{
stack.Push(popped);
stack.Push(bit);
}
else if (windowsDriveStart != -1)
{
stack.Add(MoveTemp(popped.Left(windowsDriveStart + 1)));
}
}
else
{
@@ -361,13 +366,13 @@ void StringUtils::PathRemoveRelativeParts(String& path)
}
else
{
stack.Push(bit);
stack.Add(MoveTemp(bit));
}
}
const bool isRooted = path.StartsWith(TEXT('/')) || (path.Length() >= 2 && path[0] == '.' && path[1] == '/');
path.Clear();
for (auto& e : stack)
for (const String& e : stack)
path /= e;
if (isRooted && path.HasChars() && path[0] != '/')
path.Insert(0, TEXT("/"));