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

loader/nso: Check if read succeeded in IdentifyFile() before checking magic value

Browse source 
We should always assume the filesystem is volatile and check each IO
operation. While we're at it reorganize checks so that early-out errors
are near one another.
This commit is contained in:
Lioncash 2018-07-19 12:40:06 -04:00
parent 758c357868
commit 9b22f856c2
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/loader/nso.cpp
View file

@ -55,15 +55,17 @@ AppLoader_NSO::AppLoader_NSO(FileSys::VirtualFile file) : AppLoader(std::move(fi
FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& file) { FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& file) {
u32 magic = 0; u32 magic = 0;
file->ReadObject(&magic); if (file->ReadObject(&magic) != sizeof(magic)) {
return FileType::Error;
if (Common::MakeMagic('N', 'S', 'O', '0') == magic) {
return FileType::NSO;
} }
if (Common::MakeMagic('N', 'S', 'O', '0') != magic) {
return FileType::Error; return FileType::Error;
} }
return FileType::NSO;
}
static std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data, static std::vector<u8> DecompressSegment(const std::vector<u8>& compressed_data,
const NsoSegmentHeader& header) { const NsoSegmentHeader& header) {
std::vector<u8> uncompressed_data; std::vector<u8> uncompressed_data;