[Scummvm-cvs-logs] SF.net SVN: scummvm:[45573] scummvm/branches/branch-1-0-0/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 45573
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45573&view=rev
Author:   lordhoto
Date:     2009-10-31 18:34:24 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Backport of r45572: "Fix some memory leaks in Kyrandia 1."

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/seqplayer.cpp
    scummvm/branches/branch-1-0-0/engines/kyra/sprites.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/seqplayer.cpp	2009-10-31 18:32:17 UTC (rev 45572)
+++ scummvm/branches/branch-1-0-0/engines/kyra/seqplayer.cpp	2009-10-31 18:34:24 UTC (rev 45573)
@@ -651,6 +651,11 @@
 	}
 	delete[] _specialBuffer;
 	_specialBuffer = 0;
+	
+	for (uint i = 0; i < ARRAYSIZE(_seqMovies); ++i) {
+		delete _seqMovies[i].movie;
+		_seqMovies[i].movie = 0;
+	}
 	return seqSkippedFlag;
 }
 

Modified: scummvm/branches/branch-1-0-0/engines/kyra/sprites.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/sprites.cpp	2009-10-31 18:32:17 UTC (rev 45572)
+++ scummvm/branches/branch-1-0-0/engines/kyra/sprites.cpp	2009-10-31 18:34:24 UTC (rev 45573)
@@ -63,10 +63,8 @@
 	uint8 *data;
 
 	for (int i = 0; i < MAX_NUM_ANIMS; i++) {
-		if (_anims[i].background) {
-			delete[] _anims[i].background;
-			_anims[i].background = 0;
-		}
+		delete[] _anims[i].background;
+		_anims[i].background = 0;
 
 		if (_anims[i].script != 0) {
 			data = _anims[i].script;
@@ -405,6 +403,9 @@
 	_res->exists(filename, true);
 	_dat = _res->fileData(filename, &fileSize);
 
+	for (uint i = 0; i < MAX_NUM_ANIMS; ++i)
+		delete[] _anims[i].background;
+
 	memset(_anims, 0, sizeof(_anims));
 	uint8 nextAnim = 0;
 


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