araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/MMaps: Change infinite loop fix in Detour

Browse Source 
Change the infinite loop fix in Detour to allow looping through all the m_nodePool nodes max once, otherwise it most likely means that we entered an infinite loop. This is currently set to 1024.

(cherry picked from commit 12e6faa0fa)
This commit is contained in:
jackpoz
2019-02-08 22:21:03 +01:00
committed by Shauren
parent 2682bf0fca
commit b0703f943c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
View File

@@ -26,7 +26,6 @@
#include "DetourAlloc.h"
#include "DetourAssert.h"
#include <new>
#include <unordered_set>
/// @class dtQueryFilter
///
@@ -1207,16 +1206,14 @@ dtStatus dtNavMeshQuery::getPathToNode(dtNode* endNode, dtPolyRef* path, int* pa
// Find the length of the entire path.
dtNode* curNode = endNode;
int length = 0;
std::unordered_set<int> processedIds;
bool alreadyProcessed = false;
do
{
length++;
alreadyProcessed = !processedIds.insert(curNode->pidx).second;
if (alreadyProcessed)
// Go through the whole m_nodepool max once, otherwise it's most likely a sign of infinite loop
if (length > m_nodePool->getMaxNodes())
return DT_FAILURE;
curNode = m_nodePool->getNodeAtIdx(curNode->pidx);
length++;
curNode = m_nodePool->getNodeAtIdx(curNode->pidx);
} while (curNode);
// If the path cannot be fully stored then advance to the last node we will be able to store.