ahmed2007/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

patch_manager: Prevent use of a dangling pointer within PatchRomFS

Browse source 
fmt::format() returns a std::string instance by value, so calling
.c_str() on it here is equivalent to doing:

auto* ptr = std::string{}.c_str();

The data being pointed to isn't guaranteed to actually be valid anymore
after that expression ends. Instead, we can just take the string as is,
and provide the necessary formatting parameters.
This commit is contained in:
Lioncash 2018-12-11 10:08:10 -05:00
parent 3b1043c58a
commit 5c72aa7c4c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/core/file_sys/patch_manager.cpp
View file

@ -286,13 +286,12 @@ static void ApplyLayeredFS(VirtualFile& romfs, u64 title_id, ContentRecordType t
VirtualFile PatchManager::PatchRomFS(VirtualFile romfs, u64 ivfc_offset, ContentRecordType type, VirtualFile PatchManager::PatchRomFS(VirtualFile romfs, u64 ivfc_offset, ContentRecordType type,
VirtualFile update_raw) const { VirtualFile update_raw) const {
const auto log_string = fmt::format("Patching RomFS for title_id={:016X}, type={:02X}", const auto log_string = fmt::format("Patching RomFS for title_id={:016X}, type={:02X}",
title_id, static_cast<u8>(type)) title_id, static_cast<u8>(type));
.c_str();
if (type == ContentRecordType::Program || type == ContentRecordType::Data) if (type == ContentRecordType::Program || type == ContentRecordType::Data)
LOG_INFO(Loader, log_string); LOG_INFO(Loader, "{}", log_string);
else else
LOG_DEBUG(Loader, log_string); LOG_DEBUG(Loader, "{}", log_string);
if (romfs == nullptr) if (romfs == nullptr)
return romfs; return romfs;