Merge pull request #12203 from liamwhite/crash-fix

set: don't load version nca with null romfs
2 years ago · 80c4743754
parent 498159d719 fd29227bc4
commit 80c4743754
1 changed files with 3 additions and 1 deletions
--- a/src/core/hle/service/set/set_sys.cpp
+++ b/src/core/hle/service/set/set_sys.cpp
@ -34,7 +34,9 @@ Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System&
        nca = bis_system->GetEntry(FirmwareVersionSystemDataId, FileSys::ContentRecordType::Data);
    }
    if (nca) {
-        romfs = FileSys::ExtractRomFS(nca->GetRomFS());
+        if (auto nca_romfs = nca->GetRomFS(); nca_romfs) {
+            romfs = FileSys::ExtractRomFS(nca_romfs);
+        }
    }
    if (!romfs) {
        romfs = FileSys::ExtractRomFS(