mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-27 01:02:48 +01:00
Merge pull request #718 from lioncash/read
loader/nso: Check if read succeeded in IdentifyFile() before checking magic value
This commit is contained in:
commit
dd0446ff43
1 changed files with 7 additions and 5 deletions
|
@ -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(header.size);
|
std::vector<u8> uncompressed_data(header.size);
|
||||||
|
|
Loading…
Reference in a new issue