armsx/ARMSX3
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX3.git synced 2026-08-24 16:58:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

ISO: ensure we're not trying to install files outside of their parent

Browse Source
This commit is contained in:
Megamouse
2026-08-10 14:45:00 +02:00
parent 400d9a1c24
commit 628ea5ec15
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Loader/ISO.cpp
+5 -1
View File
@@ -3,6 +3,7 @@
#include "ISO.h"
#include "Emu/VFS.h"
#include "Emu/system_utils.hpp"
#include "Emu/System.h"
#include "Crypto/utils.h"
#include <codecvt>
@@ -921,6 +922,9 @@ static void iso_form_hierarchy(fs::file& file, iso_fs_node& node, bool use_ucs2_
return;
}
const std::string node_path = parent_path + "/" + node.metadata.name;
ensure(parent_path.empty() || Emu.IsPathInsideDir(node_path, parent_path, false));
std::vector<usz> multi_extent_node_indices;
// Assuming the directory spans a single extent
@@ -978,7 +982,7 @@ static void iso_form_hierarchy(fs::file& file, iso_fs_node& node, bool use_ucs2_
{
if (child_node->metadata.name != "." && child_node->metadata.name != "..")
{
iso_form_hierarchy(file, *child_node, use_ucs2_decoding, parent_path + "/" + node.metadata.name);
iso_form_hierarchy(file, *child_node, use_ucs2_decoding, node_path);
}
}
}