From a56e28db74ac6855d2421f017877ea07bbcca6dd Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Mon, 26 Dec 2016 22:28:46 +0100
Subject: [PATCH] [IGfxImage] Fix image loading

---
 src/Components/Modules/AssetInterfaces/IGfxImage.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Components/Modules/AssetInterfaces/IGfxImage.cpp b/src/Components/Modules/AssetInterfaces/IGfxImage.cpp
index 8b967b1b..df80a01d 100644
--- a/src/Components/Modules/AssetInterfaces/IGfxImage.cpp
+++ b/src/Components/Modules/AssetInterfaces/IGfxImage.cpp
@@ -60,13 +60,20 @@ namespace Assets
 
 			const Game::GfxImageFileHeader* iwiHeader = reinterpret_cast<const Game::GfxImageFileHeader*>(iwiBuffer.data());
 
+			if (std::memcmp(iwiHeader->tag, "IWi", 3) && iwiHeader->version == 8)
+			{
+				Components::Logger::Error("Image is not a valid IWi!");
+				return;
+			}
+
 			image->mapType = Game::MAPTYPE_2D;
 			image->dataLen1 = iwiHeader->fileSizeForPicmip[0] - 32;
 			image->dataLen2 = iwiHeader->fileSizeForPicmip[0] - 32;
 
-			if (std::memcmp(iwiHeader->tag, "IWi", 3) && iwiHeader->version == 8)
+			image->loadDef = builder->getAllocator()->allocate<Game::GfxImageLoadDef>();
+			if (!image->loadDef)
 			{
-				Components::Logger::Error("Image is not a valid IWi!");
+				Components::Logger::Error("Failed to allocate GfxImageLoadDef structure!");
 				return;
 			}