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

Fixed a couple of bounds checks in detail mesh height query.

Browse Source
This commit is contained in:
Mikko Mononen 2009-11-20 08:15:09 +00:00
parent 5ecdda0a18
commit b93bd10fa4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Recast/Source/RecastMeshDetail.cpp
View File

@ -762,8 +762,8 @@ static void getHeightData(const rcCompactHeightfield& chf,
cy /= npoly; cy /= npoly;
cz /= npoly; cz /= npoly;
if (cx >= hp.xmin || cx < hp.xmin+hp.width || if (cx >= hp.xmin && cx < hp.xmin+hp.width &&
cz >= hp.ymin || cz < hp.ymin+hp.height) cz >= hp.ymin && cz < hp.ymin+hp.height)
{ {
const rcCompactCell& c = chf.cells[cx+cz*chf.width]; const rcCompactCell& c = chf.cells[cx+cz*chf.width];
int dmin = 0xffff; int dmin = 0xffff;
@ -928,7 +928,7 @@ bool rcBuildPolyMeshDetail(const rcPolyMesh& mesh, const rcCompactHeightfield& c
return false; return false;
} }
rcScopedDelete<float> poly = new float[nvp*3]; rcScopedDelete<float> poly = new float[nvp*3];
if (!bounds) if (!poly)
{ {
if (rcGetLog()) if (rcGetLog())
rcGetLog()->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'poly' (%d).", nvp*3); rcGetLog()->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'poly' (%d).", nvp*3);
@ -1017,7 +1017,7 @@ bool rcBuildPolyMeshDetail(const rcPolyMesh& mesh, const rcCompactHeightfield& c
{ {
const unsigned short* p = &mesh.polys[i*nvp*2]; const unsigned short* p = &mesh.polys[i*nvp*2];
// Find polygon bounding box. // Store polygon vertices for processing.
int npoly = 0; int npoly = 0;
for (int j = 0; j < nvp; ++j) for (int j = 0; j < nvp; ++j)
{ {