[IGfxWorld] Fix runtime data overflow

src/Components/Modules/AssetInterfaces/IGfxImage.cpp

@@ -52,6 +52,11 @@ namespace Assets
 			image->loaded = true;
 			image->loadDef->flags = 0;
 
+			if(image->loadDef->resourceSize != image->dataLen1)
+			{
+				Components::Logger::Error("Resource size doesn't match the data length (%s)!\n", name.data());
+			}
+
 			if (Utils::String::StartsWith(name, "*lightmap"))
 			{
 				image->loadDef->dimensions[0] = 0;

src/Components/Modules/AssetInterfaces/IGfxWorld.cpp

@@ -909,7 +909,7 @@ namespace Assets
 		SaveLogExit();
 	}
 
-	void IGfxWorld::saveGfxWorldDpvsDynamic(Game::GfxWorldDpvsDynamic* asset, Game::GfxWorldDpvsDynamic* dest, Components::ZoneBuilder::Zone* builder)
+	void IGfxWorld::saveGfxWorldDpvsDynamic(Game::GfxWorldDpvsDynamic* asset, Game::GfxWorldDpvsDynamic* dest, int cellCount, Components::ZoneBuilder::Zone* builder)
 	{
 		AssertSize(Game::GfxWorldDpvsDynamic, 48);
 
@@ -921,14 +921,14 @@ namespace Assets
 		if (asset->dynEntCellBits[0])
 		{
 			buffer->align(Utils::Stream::ALIGN_4);
-			buffer->saveArray(asset->dynEntCellBits[0], asset->dynEntClientWordCount[0]);
+			buffer->save(asset->dynEntCellBits[0], 4, asset->dynEntClientWordCount[0] * cellCount);
 			Utils::Stream::ClearPointer(&dest->dynEntCellBits[0]);
 		}
 
 		if (asset->dynEntCellBits[1])
 		{
 			buffer->align(Utils::Stream::ALIGN_4);
-			buffer->saveArray(asset->dynEntCellBits[1], asset->dynEntClientWordCount[1]);
+			buffer->save(asset->dynEntCellBits[1], 4, asset->dynEntClientWordCount[1] * cellCount);
 			Utils::Stream::ClearPointer(&dest->dynEntCellBits[1]);
 		}
 
@@ -1188,14 +1188,14 @@ namespace Assets
 		if (asset->cellCasterBits)
 		{
 			buffer->align(Utils::Stream::ALIGN_4);
-			buffer->saveArray(asset->cellCasterBits, cellCount * ((cellCount + 31) >> 5));
+			buffer->save(asset->cellCasterBits, 4, cellCount * ((cellCount + 31) >> 5));
 			Utils::Stream::ClearPointer(&dest->cellCasterBits);
 		}
 
 		if (asset->cellHasSunLitSurfsBits)
 		{
 			buffer->align(Utils::Stream::ALIGN_4);
-			buffer->saveArray(asset->cellHasSunLitSurfsBits, ((cellCount + 31) >> 5));
+			buffer->save(asset->cellHasSunLitSurfsBits, 4, ((cellCount + 31) >> 5));
 			Utils::Stream::ClearPointer(&dest->cellHasSunLitSurfsBits);
 		}
 
@@ -1332,7 +1332,7 @@ namespace Assets
 		}
 
 		this->saveGfxWorldDpvsStatic(asset, &asset->dpvs, &dest->dpvs, asset->dpvsPlanes.cellCount, builder);
-		this->saveGfxWorldDpvsDynamic(&asset->dpvsDyn, &dest->dpvsDyn, builder);
+		this->saveGfxWorldDpvsDynamic(&asset->dpvsDyn, &dest->dpvsDyn, asset->dpvsPlanes.cellCount, builder);
 
 		if (asset->heroOnlyLights)
 		{

src/Components/Modules/AssetInterfaces/IGfxWorld.hpp

@@ -16,7 +16,7 @@ namespace Assets
 		void saveGfxLightGrid(Game::GfxLightGrid* asset, Game::GfxLightGrid* dest, Components::ZoneBuilder::Zone* builder);
 		void savesunflare_t(Game::sunflare_t* asset, Game::sunflare_t* dest, Components::ZoneBuilder::Zone* builder);
 		void saveGfxWorldDpvsStatic(Game::GfxWorld* world, Game::GfxWorldDpvsStatic* asset, Game::GfxWorldDpvsStatic* dest, int planeCount, Components::ZoneBuilder::Zone* builder);
-		void saveGfxWorldDpvsDynamic(Game::GfxWorldDpvsDynamic* asset, Game::GfxWorldDpvsDynamic* dest, Components::ZoneBuilder::Zone* builder);
+		void saveGfxWorldDpvsDynamic(Game::GfxWorldDpvsDynamic* asset, Game::GfxWorldDpvsDynamic* dest, int cellCount, Components::ZoneBuilder::Zone* builder);
 
 		void loadGfxWorldDraw(Game::GfxWorldDraw* asset, Components::ZoneBuilder::Zone* builder, Utils::Stream::Reader* reader);
 		void loadGfxWorldDpvsStatic(Game::GfxWorld* world, Game::GfxWorldDpvsStatic* asset, Components::ZoneBuilder::Zone* builder, Utils::Stream::Reader* reader);

src/Components/Modules/ZoneBuilder.cpp

@@ -98,6 +98,11 @@ namespace Components
 		Logger::Print("Saving...\n");
 		this->saveData();
 
+		if(this->buffer.hasBlock())
+		{
+			Logger::Error("Non-popped blocks left!\n");
+		}
+
 		Logger::Print("Compressing...\n");
 		this->writeZone();
 	}

src/Utils/CSV.cpp

@@ -98,7 +98,7 @@ namespace Utils
 
 		for (unsigned int i = 0; i < row.size(); ++i)
 		{
-			if (row[i] == ',' && !isString) // FLush entry
+			if (row[i] == ',' && !isString) // Flush entry
 			{
 				_row.push_back(element);
 				element.clear();

src/Utils/Stream.cpp

@@ -246,6 +246,11 @@ namespace Utils
 		return false;
 	}
 
+	bool Stream::hasBlock()
+	{
+		return !this->streamStack.empty();
+	}
+
 	bool Stream::isValidBlock(Game::XFILE_BLOCK_TYPES stream)
 	{
 		return (stream < Game::MAX_XFILE_COUNT && stream >= Game::XFILE_BLOCK_TEMP);

src/Utils/Stream.hpp

@@ -117,6 +117,7 @@ namespace Utils
 		void increaseBlockSize(unsigned int size);
 		Game::XFILE_BLOCK_TYPES getCurrentBlock();
 		unsigned int getBlockSize(Game::XFILE_BLOCK_TYPES stream);
+		bool hasBlock();
 
 		DWORD getPackedOffset();