From 5b4c29b12393f9da26a55408ea179d4813ca2c45 Mon Sep 17 00:00:00 2001 From: Maufeat Date: Sat, 25 Jul 2026 00:31:22 +0200 Subject: [file_sys] Quick sandbox escape fix (#4223) Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4223 Reviewed-by: Lizzie Reviewed-by: MaranBr --- src/common/fs/path_util.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/common/fs/path_util.cpp') diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 3844cca06b..4105855866 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp @@ -476,6 +476,29 @@ std::string SanitizePath(std::string_view path_, DirectorySeparator directory_se path.erase(std::unique(start, path.end(), [type2](char c1, char c2) { return c1 == type2 && c2 == type2; }), path.end()); + + const bool absolute = !path.empty() && path[0] == type2; + std::vector parts; + + for (const auto part : SplitPathComponents(path)) + { + if (part.empty() || part == ".") + continue; + if (part == ".." && !parts.empty() && parts.back() != "..") + parts.pop_back(); + else if (part != "..") parts.push_back(part); + } + + std::string resolved = absolute ? std::string(1, type2) : std::string{}; + for (std::size_t i = 0; i < parts.size(); ++i) + { + if (i != 0) + resolved += type2; + resolved.append(parts[i].data(), parts[i].size()); + } + + path = std::move(resolved); + return std::string(RemoveTrailingSlash(path)); } -- cgit v1.2.3