Skip to content

Commit 4f06c9b

Browse files
authored
fix(memory): Fix miscellaneous memory issues (#1561)
1 parent 8adf485 commit 4f06c9b

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

Core/Libraries/Source/WWVegas/WW3D2/collect.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,7 @@ void CollectionDefClass::Free(void)
968968
for (int i=0; i<ObjectNames.Count(); i++) {
969969
delete[] ObjectNames[i];
970970
}
971+
ObjectNames.Delete_All ();
971972

972973
ProxyList.Delete_All ();
973974
}

Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,8 @@ HCompressedAnimClass::~HCompressedAnimClass(void)
214214
*=============================================================================================*/
215215
void HCompressedAnimClass::Free(void)
216216
{
217-
if (NodeMotion != NULL) {
218-
delete[] NodeMotion;
219-
}
217+
delete[] NodeMotion;
218+
NodeMotion = NULL;
220219
}
221220

222221

Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ void WWMemoryLogClass::Register_Memory_Released(int category,int size)
531531
static void _MemLogCleanup(void)
532532
{
533533
delete _TheMemLog;
534+
_TheMemLog = NULL;
534535
}
535536

536537

Generals/Code/Tools/GUIEdit/Source/EditWindow.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ void EditWindow::shutdown( void )
500500
// delete asset manager
501501
m_assetManager->Free_Assets();
502502
delete m_assetManager;
503+
m_assetManager = NULL;
503504

504505
// shutdown WW3D
505506
WW3D::Shutdown();

GeneralsMD/Code/Tools/GUIEdit/Source/EditWindow.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ void EditWindow::shutdown( void )
500500
// delete asset manager
501501
m_assetManager->Free_Assets();
502502
delete m_assetManager;
503+
m_assetManager = NULL;
503504

504505
// shutdown WW3D
505506
WW3D::Shutdown();

0 commit comments

Comments
 (0)