Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-22 05:27:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add null checks to all free calls to prevent crash on server close. (#709)

Browse Source
This commit is contained in:
Jett 2022-08-04 14:54:14 +01:00 committed by GitHub
parent e6c7f744b5
commit 88f316bf93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dNavigation/dNavMesh.cpp
View File

@ -28,13 +28,13 @@ dNavMesh::dNavMesh(uint32_t zoneId) {
dNavMesh::~dNavMesh() { dNavMesh::~dNavMesh() {
// Clean up Recast information // Clean up Recast information
rcFreeHeightField(m_Solid); if(m_Solid) rcFreeHeightField(m_Solid);
rcFreeCompactHeightfield(m_CHF); if (m_CHF) rcFreeCompactHeightfield(m_CHF);
rcFreeContourSet(m_CSet); if (m_CSet) rcFreeContourSet(m_CSet);
rcFreePolyMesh(m_PMesh); if (m_PMesh) rcFreePolyMesh(m_PMesh);
rcFreePolyMeshDetail(m_PMDMesh); if (m_PMDMesh) rcFreePolyMeshDetail(m_PMDMesh);
dtFreeNavMesh(m_NavMesh); if (m_NavMesh) dtFreeNavMesh(m_NavMesh);
dtFreeNavMeshQuery(m_NavQuery); if (m_NavQuery) dtFreeNavMeshQuery(m_NavQuery);
if (m_Ctx) delete m_Ctx; if (m_Ctx) delete m_Ctx;
if (m_Triareas) delete[] m_Triareas; if (m_Triareas) delete[] m_Triareas;

7
dPhysics/dpWorld.cpp
View File

@ -32,9 +32,10 @@ dpWorld::~dpWorld() {
m_Grid = nullptr; m_Grid = nullptr;
} }
m_NavMesh->~dNavMesh(); if (m_NavMesh) {
delete m_NavMesh; delete m_NavMesh;
m_NavMesh = nullptr; m_NavMesh = nullptr;
}
} }
void dpWorld::StepWorld(float deltaTime) { void dpWorld::StepWorld(float deltaTime) {

2
dPhysics/dpWorld.h
View File

@ -42,5 +42,5 @@ private:
std::vector<dpEntity*> m_StaticEntities; std::vector<dpEntity*> m_StaticEntities;
std::vector<dpEntity*> m_DynamicEntites; std::vector<dpEntity*> m_DynamicEntites;
dNavMesh* m_NavMesh; dNavMesh* m_NavMesh = nullptr;
}; };