diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-02-27 22:56:29 +0100 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2015-03-18 00:09:07 +0000 |
| commit | f3f44c468de781ec6d807483cd4d8917189249c1 (patch) | |
| tree | fc2d56d7cf28dc5a71596ef83623919358cbf1a1 /src/server/collision/Maps/MapTree.cpp | |
| parent | 1a583703c54293dfb0a454907bb8863b9d339fa4 (diff) | |
Core/Collision: Fix crash when loading invalid vmap data
Fix array overflow when loading Models from vmap tiles with wrong/outdated/bad data.
Try extracting again vmaps if you see this error.
Closes #14255
(cherry picked from commit 3035a4218bddb4362efa81a12c6bafb3c1b727bf)
Diffstat (limited to 'src/server/collision/Maps/MapTree.cpp')
| -rw-r--r-- | src/server/collision/Maps/MapTree.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index 72435594ad0..b493ec18f5f 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -386,13 +386,12 @@ namespace VMAP { if (!iLoadedSpawns.count(referencedVal)) { -#ifdef VMAP_DEBUG if (referencedVal > iNTreeValues) { - TC_LOG_DEBUG("maps", "StaticMapTree::LoadMapTile() : invalid tree element (%u/%u)", referencedVal, iNTreeValues); + VMAP_ERROR_LOG("maps", "StaticMapTree::LoadMapTile() : invalid tree element (%u/%u) referenced in tile %s", referencedVal, iNTreeValues, tilefile.c_str()); continue; } -#endif + iTreeValues[referencedVal] = ModelInstance(spawn, model); iLoadedSpawns[referencedVal] = 1; } |