From 474fa45ebb9a174cf7eadf68bfaeb1cb5a68c30e Mon Sep 17 00:00:00 2001 From: Antz Date: Wed, 24 Feb 2016 11:51:37 +0000 Subject: [PATCH] Fix crash when loading invalid vmap data. Author @jackpoz Fix array overflow when loading Models from vmap tiles with wrong/outdated/bad data. --- src/game/vmap/MapTree.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/game/vmap/MapTree.cpp b/src/game/vmap/MapTree.cpp index 7b3add0f..0e431795 100644 --- a/src/game/vmap/MapTree.cpp +++ b/src/game/vmap/MapTree.cpp @@ -393,13 +393,11 @@ namespace VMAP size_t fileRead = fread(&referencedVal, sizeof(uint32), 1, tf); if (!iLoadedSpawns.count(referencedVal) || fileRead <= 0) { -#ifdef VMAP_DEBUG if (referencedVal > iNTreeValues) { - DEBUG_LOG("invalid tree element! (%u/%u)", referencedVal, iNTreeValues); + ERROR_LOG("invalid tree element! (%u/%u)", referencedVal, iNTreeValues); continue; } -#endif iTreeValues[referencedVal] = ModelInstance(spawn, model); iLoadedSpawns[referencedVal] = 1; }