瀏覽代碼

Merge pull request #12203 from liamwhite/crash-fix

set: don't load version nca with null romfs
liamwhite 2 年之前
父節點
當前提交
80c4743754
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/core/hle/service/set/set_sys.cpp

+ 3 - 1
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(