server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when loading invalid vmap data. Author @jackpoz

Browse Source 
Fix array overflow when loading Models from vmap tiles with wrong/outdated/bad data.
This commit is contained in:
Antz 2016-02-24 11:51:37 +00:00
parent e971e46477
commit 474fa45ebb
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/vmap/MapTree.cpp
View File

@ -393,13 +393,11 @@ namespace VMAP
size_t fileRead = fread(&referencedVal, sizeof(uint32), 1, tf); size_t fileRead = fread(&referencedVal, sizeof(uint32), 1, tf);
if (!iLoadedSpawns.count(referencedVal) || fileRead <= 0) if (!iLoadedSpawns.count(referencedVal) || fileRead <= 0)
{ {
#ifdef VMAP_DEBUG
if (referencedVal > iNTreeValues) if (referencedVal > iNTreeValues)
{ {
DEBUG_LOG("invalid tree element! (%u/%u)", referencedVal, iNTreeValues); ERROR_LOG("invalid tree element! (%u/%u)", referencedVal, iNTreeValues);
continue; continue;
} }
#endif
iTreeValues[referencedVal] = ModelInstance(spawn, model); iTreeValues[referencedVal] = ModelInstance(spawn, model);
iLoadedSpawns[referencedVal] = 1; iLoadedSpawns[referencedVal] = 1;
} }