Fixed memory leak with hintmessage. (#581)

Fixed memory leak with hintmessage.
s1lentq · Nov 21, 2020 · 519b7db · 519b7db
1 parent 99954a2
commit 519b7db
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/regamedll/dlls/hintmessage.cpp b/regamedll/dlls/hintmessage.cpp
@@ -15,10 +15,7 @@ CHintMessage::CHintMessage(const char *hintString, bool isHint, CUtlVector<const
 
 CHintMessage::~CHintMessage()
 {
-	for (int i = 0; i < m_args.Count(); i++)
-		delete[] m_args[i];
-
-	m_args.RemoveAll();
+	m_args.PurgeAndDeleteArrays();
 }
 
 void CHintMessage::Send(CBaseEntity *client)
@@ -29,11 +26,7 @@ void CHintMessage::Send(CBaseEntity *client)
 void CHintMessageQueue::Reset()
 {
 	m_tmMessageEnd = 0;
-
-	for (int i = 0; i < m_messages.Count(); i++)
-		delete m_messages[i];
-
-	m_messages.RemoveAll();
+	m_messages.PurgeAndDeleteElements();
 }
 
 void CHintMessageQueue::Update(CBaseEntity *client)

diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
@@ -99,6 +99,7 @@ void CBasePlayer::OnDestroy()
 		delete[] m_rebuyString;
 		m_rebuyString = nullptr;
 	}
+	m_hintMessageQueue.Reset();
 }
 #endif
 

diff --git a/regamedll/public/utlvector.h b/regamedll/public/utlvector.h
@@ -121,6 +121,7 @@ class CUtlVector
 
 	// Purges the list and calls delete on each element in it.
 	void PurgeAndDeleteElements();
+	void PurgeAndDeleteArrays();
 
 	// Set the size by which it grows when it needs to allocate more memory.
 	void SetGrowSize(int size);
@@ -547,6 +548,15 @@ inline void CUtlVector<T>::PurgeAndDeleteElements()
 	Purge();
 }
 
+template <class T>
+inline void CUtlVector<T>::PurgeAndDeleteArrays()
+{
+	for (int i = 0; i < m_Size; i++)
+		delete[] Element(i);
+
+	Purge();
+}
+
 template <class T>
 void CUtlVector<T>::SetGrowSize(int size)
 {