Browse Source

submission_package: Correct location of null check within SetTicketKeys()

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.
pull/15/merge
Lioncash 7 years ago
parent
commit
dade709f63
  1. 9
      src/core/file_sys/submission_package.cpp

9
src/core/file_sys/submission_package.cpp

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

Loading…
Cancel
Save