ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix possible bullet crash

Browse Source
This commit is contained in:
Benau 2020-03-09 16:12:49 +08:00
parent 1ea75b5f0e
commit 10e7ac603f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
View File

@ -176,16 +176,16 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
#else
insertIndex = 0;
#endif
if (insertIndex < 0 || insertIndex >= MANIFOLD_CACHE_SIZE)
insertIndex = 0;
clearUserCache(m_pointCache[insertIndex]);
} else
}
else
{
m_cachedPoints++;
if (insertIndex < 0 || insertIndex >= MANIFOLD_CACHE_SIZE)
insertIndex = 0;
}
if (insertIndex<0)
insertIndex=0;
btAssert(m_pointCache[insertIndex].m_userPersistentData==0);
m_pointCache[insertIndex] = newPoint;

2
lib/bullet/src/BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
View File

@ -422,6 +422,8 @@ void btPolyhedralContactClipping::clipHullAgainstHull(const btVector3& separatin
}
}
}
if (closestFaceB == -1 || closestFaceB >= hullB.m_faces.size())
return;
btVertexArray worldVertsB1;
{
const btFace& polyB = hullB.m_faces[closestFaceB];