server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #136 from Janiels/null-check

Browse Source 
findNearestPoly now fails when nearestRef is null, and only assigns it when the function succeeds
This commit is contained in:
Ben Hymers 2015-12-17 18:14:41 +00:00
commit 68ec46a685
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Detour/Source/DetourNavMeshQuery.cpp
View File

@ -712,7 +712,8 @@ dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* exten
{ {
dtAssert(m_nav); dtAssert(m_nav);
*nearestRef = 0; if (!nearestRef)
return DT_FAILURE | DT_INVALID_PARAM;
// Get nearby polygons from proximity grid. // Get nearby polygons from proximity grid.
const int MAX_SEARCH = 128; const int MAX_SEARCH = 128;
@ -721,6 +722,8 @@ dtStatus dtNavMeshQuery::findNearestPoly(const float* center, const float* exten
if (dtStatusFailed(queryPolygons(center, extents, filter, polys, &polyCount, MAX_SEARCH))) if (dtStatusFailed(queryPolygons(center, extents, filter, polys, &polyCount, MAX_SEARCH)))
return DT_FAILURE | DT_INVALID_PARAM; return DT_FAILURE | DT_INVALID_PARAM;
*nearestRef = 0;
if (polyCount == 0) if (polyCount == 0)
return DT_SUCCESS; return DT_SUCCESS;