From 519b7db38d46333ebc257cb8dad9d804c67a123e Mon Sep 17 00:00:00 2001
From: jeefo <dmitry@jeefo.net>
Date: Sat, 21 Nov 2020 22:19:50 +0300
Subject: [PATCH] Fixed memory leak with hintmessage. (#581)

Fixed memory leak with hintmessage.
---
 regamedll/dlls/hintmessage.cpp | 11 ++---------
 regamedll/dlls/player.cpp      |  1 +
 regamedll/public/utlvector.h   | 10 ++++++++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/regamedll/dlls/hintmessage.cpp b/regamedll/dlls/hintmessage.cpp
index f6c1c6b66..71f47d912 100644
--- 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
index 2cd0d62c2..4e9f3088f 100644
--- 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
index acd51d4d3..d3089f000 100644
--- 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)
 {