[mechanics] Fix BulletSpaceFilter destructor segfault

siconos · Feb 19, 2016 · 83ce528 · 83ce528
1 parent e045e95
commit 83ce528
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/mechanics/src/contactDetection/bullet/BulletSpaceFilter.cpp b/mechanics/src/contactDetection/bullet/BulletSpaceFilter.cpp
@@ -119,6 +119,17 @@ BulletSpaceFilter::BulletSpaceFilter(SP::Model model) :
 
 }
 
+BulletSpaceFilter::~BulletSpaceFilter()
+{
+    // btCollisionObjects contain pointers to _broadphase (so-called
+    // "broadphase handles") that are referenced during the
+    // _collisionWorld destructor, therefore if _broadphase is
+    // destroyed too early we get a segfault.  Avoid this by
+    // explicitly destroying _collisionWorld before automatic
+    // shared_ptr destruction.
+    _collisionWorld.reset();
+}
+
 void BulletSpaceFilter::setCollisionConfiguration(
   SP::btDefaultCollisionConfiguration collisionConfig)
 {

diff --git a/mechanics/src/contactDetection/bullet/BulletSpaceFilter.hpp b/mechanics/src/contactDetection/bullet/BulletSpaceFilter.hpp
@@ -45,6 +45,10 @@ class BulletSpaceFilter : public SpaceFilter
 public:
   BulletSpaceFilter(SP::Model model);
 
+  /** Destructor.
+   */
+  virtual ~BulletSpaceFilter();
+
   /** get Bullet collision configuration
       \return a pointer on a Bullet collision configuration
   */