[Scummvm-cvs-logs] SF.net SVN: scummvm:[54246] scummvm/trunk/engines/lastexpress/game/entities .cpp

littleboy at users.sourceforge.net littleboy at users.sourceforge.net
Mon Nov 15 16:48:20 CET 2010


Revision: 54246
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54246&view=rev
Author:   littleboy
Date:     2010-11-15 15:48:20 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
LASTEXPRESS: Fix frame leak in Entities::processFrame()

When not keeping the previous frame, the current frame was overwritten.
We now delete it before assigning a new value.

Modified Paths:
--------------
    scummvm/trunk/engines/lastexpress/game/entities.cpp

Modified: scummvm/trunk/engines/lastexpress/game/entities.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/game/entities.cpp	2010-11-15 15:48:08 UTC (rev 54245)
+++ scummvm/trunk/engines/lastexpress/game/entities.cpp	2010-11-15 15:48:20 UTC (rev 54246)
@@ -1174,8 +1174,12 @@
 	getScenes()->addToQueue(frame);
 
 	// Keep previous frame if needed and store the new frame
-	if (keepPreviousFrame)
+	if (keepPreviousFrame) {
+		SAFE_DELETE(data->frame1);
 		data->frame1 = data->frame;
+	} else {
+		SAFE_DELETE(data->frame);
+	}
 
 	data->frame = frame;
 


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




More information about the Scummvm-git-logs mailing list