Merge pull request #8108 from lioncash/use-after-move

Core/Boot/Boot: Amend use-after-move cases in GenerateFromFile()

1 files changed, 7 insertions, 5 deletions

diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 5da27aac5f..3a3f38a7f5 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -155,7 +155,7 @@ BootParameters::GenerateFromFile(std::vector<std::string> paths,
     std::transform(extension.begin(), extension.end(), extension.begin(), ::tolower);
   }
 
-  const std::string path = paths.front();
+  std::string path = paths.front();
   if (paths.size() == 1)
     paths.clear();
 
@@ -172,14 +172,16 @@ BootParameters::GenerateFromFile(std::vector<std::string> paths,
 
     if (extension == ".elf")
     {
-      return std::make_unique<BootParameters>(
-          Executable{std::move(path), std::make_unique<ElfReader>(path)}, savestate_path);
+      auto elf_reader = std::make_unique<ElfReader>(path);
+      return std::make_unique<BootParameters>(Executable{std::move(path), std::move(elf_reader)},
+                                              savestate_path);
     }
 
     if (extension == ".dol")
     {
-      return std::make_unique<BootParameters>(
-          Executable{std::move(path), std::make_unique<DolReader>(path)}, savestate_path);
+      auto dol_reader = std::make_unique<DolReader>(path);
+      return std::make_unique<BootParameters>(Executable{std::move(path), std::move(dol_reader)},
+                                              savestate_path);
     }
 
     if (is_drive)