Merge branch 'omar-elhamedy-patch-1' into develop

DanielChappuis · May 31, 2024 · 015d9d1 · 015d9d1
2 parents ff20874 + 6fc73c1
commit 015d9d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Fixed
 
+- Issue [#377](https://github.com/DanielChappuis/reactphysics3d/issues/377) Fix assert when destroying an empty PhysicsWorld
 - Issue [#378](https://github.com/DanielChappuis/reactphysics3d/issues/378) Fix issue with raycasting of HeightFieldShape
 - Fix crash within testbed application in raycasting scene
 

diff --git a/include/reactphysics3d/containers/Deque.h b/include/reactphysics3d/containers/Deque.h
@@ -296,8 +296,13 @@ class Deque {
 
             clear();
 
-            // Release the chunks array
-            mAllocator.release(mBuffer, sizeof(T) * mCapacity);
+            if (mCapacity > 0) {
+
+                assert(mBuffer != nullptr);
+
+                // Release the chunks array
+                mAllocator.release(mBuffer, sizeof(T) * mCapacity);
+            }
 
             mCapacity = 0;
             mBuffer = nullptr;