Fix memory leak in INIClass, memory corruption in HashTableClass (#799)

TheAssemblyArmada · Nov 16, 2022 · 29d0a2e · 29d0a2e
1 parent bf3b5e9
commit 29d0a2e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/game/common/system/memdynalloc.cpp b/src/game/common/system/memdynalloc.cpp
@@ -69,7 +69,7 @@ void DynamicMemoryAllocator::Init(MemoryPoolFactory *factory, int subpools, Pool
 
 DynamicMemoryAllocator::~DynamicMemoryAllocator()
 {
-    captainslog_dbgassert(m_usedBlocksInDma, "Destroying none empty DMA.");
+    captainslog_dbgassert(m_usedBlocksInDma == 0, "Destroying none empty DMA.");
 
     for (int i = 0; i < m_poolCount; ++i) {
         m_factory->Destroy_Memory_Pool(m_pools[i]);

diff --git a/src/w3d/lib/hash.cpp b/src/w3d/lib/hash.cpp
@@ -34,7 +34,7 @@ HashTableClass::HashTableClass(int size)
 HashTableClass::~HashTableClass()
 {
     if (m_hashTable) {
-        delete (m_hashTable);
+        delete[](m_hashTable);
     }
     m_hashTable = nullptr;
 }

diff --git a/src/w3d/lib/iniclass.cpp b/src/w3d/lib/iniclass.cpp
@@ -99,6 +99,14 @@ INIClass::INIClass(FileClass &file) : m_fileName(nullptr)
 INIClass::~INIClass()
 {
     Clear();
+    Shutdown();
+}
+
+void INIClass::Shutdown()
+{
+    delete m_sectionList;
+    delete m_sectionIndex;
+    delete[] m_fileName;
 }
 
 void INIClass::Initialize()

diff --git a/src/w3d/lib/iniclass.h b/src/w3d/lib/iniclass.h
@@ -137,6 +137,7 @@ class INIClass
     virtual ~INIClass();
 
     void Initialize();
+    void Shutdown();
     bool Clear(const char *section = nullptr, const char *entry = nullptr);
     bool Is_Loaded() const { return m_sectionList->First()->Is_Valid(); }