archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix utils::get_firmware_version()

Browse source 
* Do not crash on invalid file contents.
* Do not crash on unexpected file.open() error.
This commit is contained in:
Eladash 2021-03-05 16:18:17 +02:00 • committed by Ivan
parent d2b0b019ec
commit 228988ca2b
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
rpcs3/util/sysinfo.cpp
View file

@ -242,24 +242,35 @@ std::string utils::get_system_info()
std::string utils::get_firmware_version() std::string utils::get_firmware_version()
{ {
const std::string file_path = g_cfg.vfs.get_dev_flash() + "vsh/etc/version.txt"; const std::string file_path = g_cfg.vfs.get_dev_flash() + "vsh/etc/version.txt";
if (fs::is_file(file_path)) if (fs::file version_file{file_path})
{ {
const fs::file version_file = fs::file(file_path); const std::string version_str = version_file.to_string();
std::string version = version_file.to_string(); std::string_view version = version_str;
// Extract version // Extract version
const usz start = version.find_first_of(':') + 1; const usz start = version.find_first_of(':') + 1;
const usz end = version.find_first_of(':', start); const usz end = version.find_first_of(':', start);
if (!start || end == umax)
{
return {};
}
version = version.substr(start, end - start); version = version.substr(start, end - start);
// Trim version // Trim version
const usz trim_start = version.find_first_not_of('0'); const usz trim_start = version.find_first_not_of('0');
const usz trim_end = version.find_last_not_of('0'); const usz trim_end = version.find_last_not_of('0');
version = version.substr(trim_start, trim_end);
return version; if (trim_start == umax)
{
return {};
} }
return "";
return std::string(version.substr(trim_start, trim_end));
}
return {};
} }
std::string utils::get_OS_version() std::string utils::get_OS_version()