Merge pull request #14186 from JoshuaVandaele/dit-crash-fix

DITConfiguration: Prevent a crash if images fail to load

1 files changed, 5 insertions, 2 deletions

diff --git a/Source/Core/InputCommon/ImageOperations.cpp b/Source/Core/InputCommon/ImageOperations.cpp
index 907cb52b8d..8fa844fec1 100644
--- a/Source/Core/InputCommon/ImageOperations.cpp
+++ b/Source/Core/InputCommon/ImageOperations.cpp
@@ -45,9 +45,12 @@ void CopyImageRegion(const ImagePixelData& src, ImagePixelData& dst, const Rect&
 std::optional<ImagePixelData> LoadImage(const std::string& path)
 {
   File::IOFile file;
-  file.Open(path, "rb");
+  if (!file.Open(path, "rb"))
+    return std::nullopt;
+
   Common::UniqueBuffer<u8> buffer(file.GetSize());
-  file.ReadBytes(buffer.data(), file.GetSize());
+  if (!file.ReadBytes(buffer.data(), file.GetSize()))
+    return std::nullopt;
 
   ImagePixelData image;
   Common::UniqueBuffer<u8> data;