[Scummvm-cvs-logs] SF.net SVN: scummvm: [30902] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 30902
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30902&view=rev
Author:   athrxx
Date:     2008-02-17 15:48:21 -0800 (Sun, 17 Feb 2008)

Log Message:
-----------
fix memory leak

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_v2.cpp
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-02-17 23:32:35 UTC (rev 30901)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-02-17 23:48:21 UTC (rev 30902)
@@ -2625,8 +2625,14 @@
 	delete [] _seqProcessedString;
 	_seqProcessedString = NULL;
 
-	delete [] _sequenceSoundList;
-	_sequenceSoundList = NULL;
+	if (_sequenceSoundList) {
+		for (int i = 0; i < _sequenceSoundListSize; i++) {
+			if (_sequenceSoundList[i])
+				delete _sequenceSoundList[i];
+		}
+		delete [] _sequenceSoundList;
+		_sequenceSoundList = NULL;
+	}
 
 	delete [] _activeWSA;
 	_activeWSA = NULL;

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2008-02-17 23:32:35 UTC (rev 30901)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2008-02-17 23:48:21 UTC (rev 30902)
@@ -945,9 +945,6 @@
 		if (_flags.platform == Common::kPlatformPC)
 			len -= 4;
 
-		tmpSndLst[i] = new char[len + 1];
-		tmpSndLst[i][0] = 0;
-
 		if (tlkfiles) {
 			for (int ii = 0; ii < tmpSize; ii++) {
 				if (!scumm_stricmp(&seqSoundList[i][1], &tlkfiles[ii][1]))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.