[Scummvm-cvs-logs] SF.net SVN: scummvm:[54236] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 54236
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54236&view=rev
Author:   dreammaster
Date:     2010-11-14 00:35:13 +0000 (Sun, 14 Nov 2010)

Log Message:
-----------
LURE: Fix for Valgrind identified memory leaks

Modified Paths:
--------------
    scummvm/trunk/engines/lure/menu.cpp
    scummvm/trunk/engines/lure/res_struct.h

Modified: scummvm/trunk/engines/lure/menu.cpp
===================================================================
--- scummvm/trunk/engines/lure/menu.cpp	2010-11-13 23:27:13 UTC (rev 54235)
+++ scummvm/trunk/engines/lure/menu.cpp	2010-11-14 00:35:13 UTC (rev 54236)
@@ -629,6 +629,8 @@
 	}
 
 bail_out:
+	delete s;
+
 #ifndef LURE_CLICKABLE_MENUS
 	mouse.setPosition(oldX, oldY);
 	mouse.cursorOn();

Modified: scummvm/trunk/engines/lure/res_struct.h
===================================================================
--- scummvm/trunk/engines/lure/res_struct.h	2010-11-13 23:27:13 UTC (rev 54235)
+++ scummvm/trunk/engines/lure/res_struct.h	2010-11-14 00:35:13 UTC (rev 54236)
@@ -445,6 +445,10 @@
 	void setRoomNumber(uint16 roomNum) { _roomNumber = roomNum; }
 	void setSupportData(CharacterScheduleEntry *newRec) {
 		assert((newRec == NULL) || (newRec->parent() != NULL));
+		if (_dynamicSupportData) {
+			delete _supportData;
+			_dynamicSupportData = false;
+		}
 		_supportData = newRec;
 	}
 	void setSupportData(uint16 entryId);


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