Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix two memory leaks, thanks to Benoit and Ole.

Browse Source
This commit is contained in:
erwin.coumans
2008-10-27 20:24:01 +00:00
parent 003b6fa669
commit 876009b053
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
View File

@@ -403,7 +403,10 @@ template <typename BP_FP_INT_TYPE>
btAxisSweep3Internal<BP_FP_INT_TYPE>::~btAxisSweep3Internal() btAxisSweep3Internal<BP_FP_INT_TYPE>::~btAxisSweep3Internal()
{ {
if (m_raycastAccelerator) if (m_raycastAccelerator)
{
m_raycastAccelerator->~btDbvtBroadphase();
btAlignedFree (m_raycastAccelerator); btAlignedFree (m_raycastAccelerator);
}
for (int i = 2; i >= 0; i--) for (int i = 2; i >= 0; i--)
{ {

5
src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
View File

@@ -60,17 +60,16 @@ btSoftBodyRigidBodyCollisionConfiguration::btSoftBodyRigidBodyCollisionConfigura
int collisionAlgorithmMaxElementSize = btMax(maxSize0,maxSize1); int collisionAlgorithmMaxElementSize = btMax(maxSize0,maxSize1);
collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize2); collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize2);
if (collisionAlgorithmMaxElementSize > curElemSize) if (collisionAlgorithmMaxElementSize > curElemSize)
{ {
m_collisionAlgorithmPool->~btPoolAllocator();
btAlignedFree(m_collisionAlgorithmPool); btAlignedFree(m_collisionAlgorithmPool);
void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16); void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
m_collisionAlgorithmPool = new(mem) btPoolAllocator(collisionAlgorithmMaxElementSize,constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize); m_collisionAlgorithmPool = new(mem) btPoolAllocator(collisionAlgorithmMaxElementSize,constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);
} }
} }
} }
btSoftBodyRigidBodyCollisionConfiguration::~btSoftBodyRigidBodyCollisionConfiguration() btSoftBodyRigidBodyCollisionConfiguration::~btSoftBodyRigidBodyCollisionConfiguration()