[Scummvm-cvs-logs] SF.net SVN: scummvm:[55233] scummvm/trunk/engines/parallaction/parallaction .cpp

[tdhs at users.sourceforge.net]

Revision: 55233
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55233&view=rev
Author:   tdhs
Date:     2011-01-14 00:13:27 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
PARALLACTION: Fix Valgrind Error on Engine Exit.

The automatic destruction of engine member "_char" of type Character at end of the destructor causes an invalid read in the destruction of the AnimationPtr which is a SharedPtr. To stop this happening, the SharedPtr is reset() prior to the destruction of Gfx, so it's dependencies on Gfx are still present. This will affect Nippon Safes as well as Big Red Adventure, but is unlikely to cause any issues and it is likely this exists in NS as well.

Thanks to fuzzie for this code.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2011-01-13 21:58:54 UTC (rev 55232)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2011-01-14 00:13:27 UTC (rev 55233)
@@ -91,6 +91,7 @@
 	_balloonMan = 0;
 
 	delete _localFlagNames;
+	_char._ani.reset();
 	delete _gfx;
 	delete _soundMan;
 	delete _disk;


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