artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

submission_package: Correct location of null check within SetTicketKeys()

Browse source 
If a ticket file was ever a null pointer, we'd cause a null pointer
dereference, as we were calling GetExtension() on the pointer instance.
This commit is contained in:
Lioncash 2018-10-03 02:06:26 -04:00
parent 02841052aa
commit dade709f63
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/file_sys/submission_package.cpp
View file

@ -23,13 +23,16 @@ void SetTicketKeys(const std::vector<VirtualFile>& files) {
Core::Crypto::KeyManager keys; Core::Crypto::KeyManager keys;
for (const auto& ticket_file : files) { for (const auto& ticket_file : files) {
if (ticket_file == nullptr) {
continue;
}
if (ticket_file->GetExtension() != "tik") { if (ticket_file->GetExtension() != "tik") {
continue; continue;
} }
if (ticket_file == nullptr || if (ticket_file->GetSize() <
ticket_file->GetSize() < Core::Crypto::TICKET_FILE_TITLEKEY_OFFSET + sizeof(Core::Crypto::Key128)) {
Core::Crypto::TICKET_FILE_TITLEKEY_OFFSET + sizeof(Core::Crypto::Key128)) {
continue; continue;
} }