Core/MMaps: Fix crash introduced in commit 32e8b65 (#17447)

* Core/MMaps: Fix crash introduced in commit 32e8b6506fc064fdba134d692dfe99298e43f055
* Also fix remaining memory leaks scenarios.

2 files changed, 47 insertions, 26 deletions

diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index 486219b9f32..2a7dfd7668b 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -179,7 +179,7 @@ namespace MMAP
         dtTileRef tileRef = 0;
 
         // memory allocated for data is now managed by detour, and will be deallocated when the tile is removed
-        if (dtStatusSucceed(mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef)))
+        if (dtStatusSucceed(mmap->navMesh->addTile(data, fileHeader.size, 0, 0, &tileRef)))
         {
             mmap->loadedTileRefs.insert(std::pair<uint32, dtTileRef>(packedGridPos, tileRef));
             ++loadedTiles;
@@ -187,7 +187,10 @@ namespace MMAP
 
             PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId);
             if (phasedMaps != phaseMapData.end())
+            {
+                mmap->AddBaseTile(packedGridPos, data, fileHeader, fileHeader.size);
                 LoadPhaseTiles(phasedMaps, x, y);
+            }
 
             return true;
         }
@@ -279,7 +282,7 @@ namespace MMAP
             if (dataItr != phasedTileItr->second.end())
             {
                 TC_LOG_DEBUG("phase", "MMAP:UnloadPhaseTile: Unloaded phased %04u%02i%02i.mmtile for root phase map %u", phaseMapId, x, y, phasedMapData->first);
-                delete dataItr->second->data;
+                dtFree(dataItr->second->data);
                 delete dataItr->second;
                 phasedTileItr->second.erase(dataItr);
             }
@@ -311,7 +314,8 @@ namespace MMAP
         dtTileRef tileRef = mmap->loadedTileRefs[packedGridPos];
 
         // unload, and mark as non loaded
-        if (dtStatusFailed(mmap->navMesh->removeTile(tileRef, NULL, NULL)))
+        unsigned char* data = NULL;
+        if (dtStatusFailed(mmap->navMesh->removeTile(tileRef, &data, NULL)))
         {
             // this is technically a memory leak
             // if the grid is later reloaded, dtNavMesh::addTile will return error but no extra memory is used
@@ -327,7 +331,12 @@ namespace MMAP
 
             PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId);
             if (phasedMaps != phaseMapData.end())
+            {
+                mmap->DeleteBaseTile(packedGridPos);
                 UnloadPhaseTile(phasedMaps, x, y);
+            }
+            else
+                dtFree(data);
             return true;
         }
 
@@ -350,13 +359,19 @@ namespace MMAP
         {
             uint32 x = (i->first >> 16);
             uint32 y = (i->first & 0x0000FFFF);
-            if (dtStatusFailed(mmap->navMesh->removeTile(i->second, NULL, NULL)))
+            unsigned char* data = NULL;
+            if (dtStatusFailed(mmap->navMesh->removeTile(i->second, &data, NULL)))
                 TC_LOG_ERROR("maps", "MMAP:unloadMap: Could not unload %04u%02i%02i.mmtile from navmesh", mapId, x, y);
             else
             {
                 PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId);
                 if (phasedMaps != phaseMapData.end())
+                {
+                    mmap->DeleteBaseTile(i->first);
                     UnloadPhaseTile(phasedMaps, x, y);
+                }
+                else
+                    dtFree(data);
                 --loadedTiles;
                 TC_LOG_DEBUG("maps", "MMAP:unloadMap: Unloaded mmtile %04i[%02i, %02i] from %04i", mapId, x, y, mapId);
             }
@@ -443,12 +458,6 @@ namespace MMAP
             dtFreeNavMeshQuery(i->second);
 
         dtFreeNavMesh(navMesh);
-
-        for (PhaseTileContainer::iterator i = _baseTiles.begin(); i != _baseTiles.end(); ++i)
-        {
-            delete (*i).second->data;
-            delete (*i).second;
-        }
     }
 
     void MMapData::RemoveSwap(PhasedTile* ptile, uint32 swap, uint32 packedXY)
@@ -472,9 +481,7 @@ namespace MMAP
 
             // restore base tile
             if (dtStatusSucceed(navMesh->addTile(_baseTiles[packedXY]->data, _baseTiles[packedXY]->dataSize, 0, 0, &loadedTileRefs[packedXY])))
-            {
                 TC_LOG_DEBUG("phase", "MMapData::RemoveSwap: Loaded base mmtile %04u[%02i, %02i] into %04i[%02i, %02i]", _mapId, x, y, _mapId, header->x, header->y);
-            }
             else
                 TC_LOG_ERROR("phase", "MMapData::RemoveSwap: Could not load base %04u%02i%02i.mmtile to navmesh", _mapId, x, y);
         }
@@ -490,7 +497,6 @@ namespace MMAP
 
     void MMapData::AddSwap(PhasedTile* ptile, uint32 swap, uint32 packedXY)
     {
-
         uint32 x = (packedXY >> 16);
         uint32 y = (packedXY & 0x0000FFFF);
 
@@ -505,7 +511,6 @@ namespace MMAP
             return;
         }
 
-
         dtMeshHeader* header = (dtMeshHeader*)ptile->data;
 
         const dtMeshTile* oldTile = navMesh->getTileByRef(loadedTileRefs[packedXY]);
@@ -520,30 +525,19 @@ namespace MMAP
         header->x = oldTile->header->x;
         header->y = oldTile->header->y;
 
-        // the removed tile's data
-        PhasedTile* pt = new PhasedTile();
         // remove old tile
-        if (dtStatusFailed(navMesh->removeTile(loadedTileRefs[packedXY], &pt->data, &pt->dataSize)))
-        {
+        if (dtStatusFailed(navMesh->removeTile(loadedTileRefs[packedXY], NULL, NULL)))
             TC_LOG_ERROR("phase", "MMapData::AddSwap: Could not unload %04u%02i%02i.mmtile from navmesh", _mapId, x, y);
-            delete pt;
-        }
         else
         {
             TC_LOG_DEBUG("phase", "MMapData::AddSwap: Unloaded %04u%02i%02i.mmtile from navmesh", _mapId, x, y);
 
-            // store the removed data first time, this is the origonal, non-phased tile
-            if (_baseTiles.find(packedXY) == _baseTiles.end())
-                _baseTiles[packedXY] = pt;
-
             _activeSwaps.insert(swap);
             loadedPhasedTiles[swap].insert(packedXY);
 
             // add new swapped tile
             if (dtStatusSucceed(navMesh->addTile(ptile->data, ptile->fileHeader.size, 0, 0, &loadedTileRefs[packedXY])))
-            {
                 TC_LOG_DEBUG("phase", "MMapData::AddSwap: Loaded phased mmtile %04u[%02i, %02i] into %04i[%02i, %02i]", swap, x, y, _mapId, header->x, header->y);
-            }
             else
                 TC_LOG_ERROR("phase", "MMapData::AddSwap: Could not load %04u%02i%02i.mmtile to navmesh", swap, x, y);
         }
@@ -576,4 +570,28 @@ namespace MMAP
 
         return navMesh;
     }
+
+    void MMapData::AddBaseTile(uint32 packedGridPos, unsigned char* data, MmapTileHeader const& fileHeader, int32 dataSize)
+    {
+        auto itr = _baseTiles.find(packedGridPos);
+        if (itr == _baseTiles.end())
+        {
+            PhasedTile* pt = new PhasedTile();
+            pt->data = data;
+            pt->fileHeader = fileHeader;
+            pt->dataSize = dataSize;
+            _baseTiles[packedGridPos] = pt;
+        }
+    }
+
+    void MMapData::DeleteBaseTile(uint32 packedGridPos)
+    {
+        auto itr = _baseTiles.find(packedGridPos);
+        if (itr != _baseTiles.end())
+        {
+            dtFree(itr->second->data);
+            delete itr->second;
+            _baseTiles.erase(itr);
+        }
+    }
 }
diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h
index bcc19b92a4e..f3ea5873c9b 100644
--- a/src/common/Collision/Management/MMapManager.h
+++ b/src/common/Collision/Management/MMapManager.h
@@ -70,6 +70,9 @@ namespace MMAP
 
         dtNavMesh* GetNavMesh(TerrainSet swaps);
 
+        void AddBaseTile(uint32 packedGridPos, unsigned char* data, MmapTileHeader const& fileHeader, int32 dataSize);
+        void DeleteBaseTile(uint32 packedGridPos);
+
         // we have to use single dtNavMeshQuery for every instance, since those are not thread safe
         NavMeshQuerySet navMeshQueries;     // instanceId to query