Merge pull request #9226 from JosJuice/bootparameters-nullptr

Fix dereferencing nullptr BootParameters
dolphin-emu · Nov 6, 2020 · 6a4ac74 · 6a4ac74
2 parents 4d1c1be + a348efe
commit 6a4ac74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
@@ -513,12 +513,16 @@ static void Run(JNIEnv* env, const std::vector<std::string>& paths,
 
   WiimoteReal::InitAdapterClass();
 
-  // No use running the loop when booting fails
   s_have_wm_user_stop = false;
+
   std::unique_ptr<BootParameters> boot = BootParameters::GenerateFromFile(paths, savestate_path);
-  boot->delete_savestate = delete_savestate;
+  if (boot)
+    boot->delete_savestate = delete_savestate;
+
   WindowSystemInfo wsi(WindowSystemType::Android, nullptr, s_surf, s_surf);
   wsi.render_surface_scale = GetRenderSurfaceScale(env);
+
+  // No use running the loop when booting fails
   if (BootManager::BootCore(std::move(boot), wsi))
   {
     ButtonManager::Init(SConfig::GetInstance().GetGameID());

diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
@@ -951,7 +951,7 @@ void MainWindow::StartGame(const std::vector<std::string>& paths,
 
 void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
 {
-  if (std::holds_alternative<BootParameters::Disc>(parameters->parameters))
+  if (parameters && std::holds_alternative<BootParameters::Disc>(parameters->parameters))
   {
     if (std::get<BootParameters::Disc>(parameters->parameters).volume->IsNKit())
     {