ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix vfs::host::rename. 

- resolve_path requires the path to be valid and can only be used before
the call to fs::rename, not after.
This commit is contained in:
aliaspider 2022-02-26 11:30:16 +01:00 committed by Ivan
parent 3972022fa2
commit 5797673daa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpcs3/Emu/VFS.cpp
View File

@ -752,9 +752,11 @@ bool vfs::host::rename(const std::string& from, const std::string& to, const lv2
return path.starts_with(from) && (path.size() == from.size() || path[from.size()] == fs::delim[0] || path[from.size()] == fs::delim[1]);
};
idm::select<lv2_fs_object, lv2_file>([&](u32 /*id*/, lv2_file& file)
std::map<u32, std::string> escaped_real;
idm::select<lv2_fs_object, lv2_file>([&](u32 id, lv2_file& file)
{
if (check_path(Emu.GetCallbacks().resolve_path(file.real_path)))
escaped_real[id] = Emu.GetCallbacks().resolve_path(file.real_path);
if (check_path(escaped_real[id]))
{
ensure(file.mp == mp);
@ -794,11 +796,9 @@ bool vfs::host::rename(const std::string& from, const std::string& to, const lv2
const auto fs_error = fs::g_tls_error;
idm::select<lv2_fs_object, lv2_file>([&](u32 /*id*/, lv2_file& file)
idm::select<lv2_fs_object, lv2_file>([&](u32 id, lv2_file& file)
{
const auto escaped_real = Emu.GetCallbacks().resolve_path(file.real_path);
if (check_path(escaped_real))
if (check_path(escaped_real[id]))
{
if (file.restore_data.seek_pos == umax)
{
@ -808,7 +808,7 @@ bool vfs::host::rename(const std::string& from, const std::string& to, const lv2
// Update internal path
if (res)
{
file.real_path = to + (escaped_real != escaped_from ? '/' + file.real_path.substr(from0.size()) : ""s);
file.real_path = to + (escaped_real[id] != escaped_from ? '/' + file.real_path.substr(from0.size()) : ""s);
}
// Reopen with ignored TRUNC, APPEND, CREATE and EXCL flags