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

xts_archive: Check if the file is nullptr prior to parsing

Browse source 
Fixes an access violation where the file no longer exists at the specified path while being parsed.
This commit is contained in:
Morph 2020-07-20 10:30:25 -04:00
parent 2ec852dd9f
commit ed46f3c62a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/file_sys/xts_archive.cpp
View file

@ -70,14 +70,18 @@ NAX::NAX(VirtualFile file_, std::array<u8, 0x10> nca_id)
NAX::~NAX() = default; NAX::~NAX() = default;
Loader::ResultStatus NAX::Parse(std::string_view path) { Loader::ResultStatus NAX::Parse(std::string_view path) {
if (file->ReadObject(header.get()) != sizeof(NAXHeader)) if (file == nullptr) {
return Loader::ResultStatus::ErrorNullFile;
}
if (file->ReadObject(header.get()) != sizeof(NAXHeader)) {
return Loader::ResultStatus::ErrorBadNAXHeader; return Loader::ResultStatus::ErrorBadNAXHeader;
}
if (header->magic != Common::MakeMagic('N', 'A', 'X', '0')) if (header->magic != Common::MakeMagic('N', 'A', 'X', '0')) {
return Loader::ResultStatus::ErrorBadNAXHeader; return Loader::ResultStatus::ErrorBadNAXHeader;
}
if (file->GetSize() < NAX_HEADER_PADDING_SIZE + header->file_size) if (file->GetSize() < NAX_HEADER_PADDING_SIZE + header->file_size) {
return Loader::ResultStatus::ErrorIncorrectNAXFileSize; return Loader::ResultStatus::ErrorIncorrectNAXFileSize;
}
keys.DeriveSDSeedLazy(); keys.DeriveSDSeedLazy();
std::array<Core::Crypto::Key256, 2> sd_keys{}; std::array<Core::Crypto::Key256, 2> sd_keys{};