TONY: Fix another memory leak identified by Valgrind

scummvm · May 5, 2012 · fbee927 · fbee927
1 parent e0a7b42
commit fbee927
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
@@ -1371,6 +1371,7 @@ bool RMOptionScreen::LoadThumbnailFromSaveState(int nState, byte *lpDestBuf, RMS
 
 RMPointer::RMPointer() {
 	Common::fill(m_pointer, m_pointer + 16, (RMGfxSourceBuffer8 *)NULL);
+	Common::fill(m_specialPointer, m_specialPointer + 16, (RMItem *)NULL);
 }
 
 RMPointer::~RMPointer() {
@@ -1417,6 +1418,11 @@ void RMPointer::Close(void) {
 			delete m_pointer[i];
 			m_pointer[i] = NULL;
 		}
+
+		if (m_specialPointer[i] != NULL) {
+			delete m_specialPointer[i];
+			m_specialPointer[i] = NULL;
+		}
 	}
 }
 

diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
@@ -195,7 +195,7 @@ class RMGfxTask {
 
 	// Registration
 	virtual void Register(void) { m_nInList++; }
-	virtual void Unregister(void) { m_nInList--; assert(m_nInList>=0); }
+	virtual void Unregister(void) { m_nInList--; assert(m_nInList >= 0); }
 };