mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

VFS: Fix some potential .back() segfaults

Browse Source
This commit is contained in:
Megamouse 2024-01-25 10:20:06 +01:00
parent 10c52cf569
commit 0d1fbfb755
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/File.cpp
View File

@ -772,7 +772,7 @@ bool fs::create_path(const std::string& path)
#ifdef _WIN32 #ifdef _WIN32
// Workaround: don't call is_dir with naked drive letter // Workaround: don't call is_dir with naked drive letter
if (parent.size() < path.size() && parent.back() != ':' && !is_dir(parent) && !create_path(parent)) if (parent.size() < path.size() && (parent.empty() || (parent.back() != ':' && !is_dir(parent) && !create_path(parent))))
#else #else
if (parent.size() < path.size() && !is_dir(parent) && !create_path(parent)) if (parent.size() < path.size() && !is_dir(parent) && !create_path(parent))
#endif #endif

33
rpcs3/Emu/vfs_config.cpp
View File

@ -14,6 +14,20 @@ std::string cfg_vfs::get(const cfg::string& _cfg, std::string_view emu_dir) cons
std::string cfg_vfs::get(const std::string& _cfg, const std::string& def, std::string_view emu_dir) const std::string cfg_vfs::get(const std::string& _cfg, const std::string& def, std::string_view emu_dir) const
{ {
std::string path = _cfg;
// Fallback
if (path.empty())
{
if (def.empty())
{
vfs_log.notice("VFS config called with empty path and empty default");
return {};
}
path = def;
}
std::string _emu_dir; // Storage only std::string _emu_dir; // Storage only
if (emu_dir.empty()) if (emu_dir.empty())
@ -34,18 +48,14 @@ std::string cfg_vfs::get(const std::string& _cfg, const std::string& def, std::s
emu_dir = _emu_dir; emu_dir = _emu_dir;
} }
std::string path = _cfg;
if (path.empty())
{
// Fallback
path = def;
}
path = fmt::replace_all(path, "$(EmulatorDir)", emu_dir); path = fmt::replace_all(path, "$(EmulatorDir)", emu_dir);
// Check if path does not end with a delimiter // Check if path does not end with a delimiter
if (path.back() != fs::delim[0] && path.back() != fs::delim[1]) if (path.empty())
{
vfs_log.error("VFS config path empty (_cfg='%s', def='%s', emu_dir='%s')", _cfg, def, emu_dir);
}
else if (path.back() != fs::delim[0] && path.back() != fs::delim[1])
{ {
path += '/'; path += '/';
} }
@ -74,6 +84,11 @@ cfg::device_info cfg_vfs::get_device_info(const cfg::device_entry& _cfg, std::st
def_path = def_it->second.path; def_path = def_it->second.path;
} }
if (info.path.empty() && def_path.empty())
{
return info;
}
info.path = get(info.path, def_path, emu_dir); info.path = get(info.path, def_path, emu_dir);
return info; return info;
} }

1
rpcs3/rpcs3qt/vfs_dialog_usb_input.cpp
View File

@ -11,6 +11,7 @@ vfs_dialog_usb_input::vfs_dialog_usb_input(const QString& name, const cfg::devic
: QDialog(parent), m_gui_settings(std::move(_gui_settings)), m_gui_save(gui::fs_dev_usb_list) : QDialog(parent), m_gui_settings(std::move(_gui_settings)), m_gui_save(gui::fs_dev_usb_list)
{ {
ensure(!!info); ensure(!!info);
ensure(!name.isEmpty());
ensure(name.back() >= '0' && name.back() <= '7'); ensure(name.back() >= '0' && name.back() <= '7');
setWindowTitle(tr("Edit %0").arg(name)); setWindowTitle(tr("Edit %0").arg(name));