summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-09-19 19:54:43 +0200
committerLioncash <mathew1800@gmail.com>2018-09-19 20:22:37 +0200
commitc8c410565927b54b2a1353ca00a1c4de38a74816 (patch)
treee1f1415a031776d6f8b779be1464882d977a1312
parentxts_archive: Ensure NAX's type member is always initialized (diff)
downloadyuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.tar
yuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.tar.gz
yuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.tar.bz2
yuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.tar.lz
yuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.tar.xz
yuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.tar.zst
yuzu-c8c410565927b54b2a1353ca00a1c4de38a74816.zip
-rw-r--r--src/core/loader/nax.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp
index b46d81c02..02a0d5ba7 100644
--- a/src/core/loader/nax.cpp
+++ b/src/core/loader/nax.cpp
@@ -21,12 +21,16 @@ AppLoader_NAX::~AppLoader_NAX() = default;
FileType AppLoader_NAX::IdentifyType(const FileSys::VirtualFile& file) {
FileSys::NAX nax(file);
- if (nax.GetStatus() == ResultStatus::Success && nax.AsNCA() != nullptr &&
- nax.AsNCA()->GetStatus() == ResultStatus::Success) {
- return FileType::NAX;
+ if (nax.GetStatus() != ResultStatus::Success) {
+ return FileType::Error;
}
- return FileType::Error;
+ const auto nca = nax.AsNCA();
+ if (nca == nullptr || nca->GetStatus() != ResultStatus::Success) {
+ return FileType::Error;
+ }
+
+ return FileType::NAX;
}
ResultStatus AppLoader_NAX::Load(Kernel::SharedPtr<Kernel::Process>& process) {