From 4970c087bcc20a48099a77935652409c69c4f888 Mon Sep 17 00:00:00 2001
From: Malkierian <malkierian@gmail.com>
Date: Mon, 27 Jan 2025 11:11:32 -0700
Subject: [PATCH] Add check to `LoadFile` to check for `fileToLoad == nullptr`
 before calling `ReadResourceInitDataLegacy` to prevent crashes from trying to
 assign to a null container with files of 0 size.

---
 src/resource/archive/Archive.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/resource/archive/Archive.cpp b/src/resource/archive/Archive.cpp
index 9d3f14559..1970c9ddf 100644
--- a/src/resource/archive/Archive.cpp
+++ b/src/resource/archive/Archive.cpp
@@ -218,6 +218,10 @@ std::shared_ptr<File> Archive::LoadFile(const std::string& filePath, std::shared
             fileToLoad->InitData = initDataFromMetaFile;
         } else {
             fileToLoad = LoadFileRaw(filePath);
+            if (fileToLoad == nullptr) {
+                SPDLOG_ERROR("Failed to load file at path {}.", filePath);
+                return nullptr;
+            }
             fileToLoad->InitData = ReadResourceInitDataLegacy(filePath, fileToLoad);
         }
     }