From a348efe947c0e2e31b98d802c1d60b79d71a143b Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Fri, 6 Nov 2020 09:34:53 +0100
Subject: [PATCH] Fix dereferencing nullptr BootParameters

---
 Source/Android/jni/MainAndroid.cpp   | 8 ++++++--
 Source/Core/DolphinQt/MainWindow.cpp | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 24eb23b75e..bc37212fe6 100644
--- 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
index 92f57bac47..069af901fb 100644
--- 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())
     {