[Scummvm-cvs-logs] SF.net SVN: scummvm:[48670] scummvm/trunk/engines/sci/graphics/animate.cpp

[thebluegr at users.sourceforge.net]

Revision: 48670
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48670&view=rev
Author:   thebluegr
Date:     2010-04-16 12:58:14 +0000 (Fri, 16 Apr 2010)

Log Message:
-----------
Added a sanity check for the current list node inside GfxAnimate::invoke(). This should fix the crash in LSL2 as described in patch #2987942, without adding additional lookups

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/animate.cpp

Modified: scummvm/trunk/engines/sci/graphics/animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/animate.cpp	2010-04-16 12:49:48 UTC (rev 48669)
+++ scummvm/trunk/engines/sci/graphics/animate.cpp	2010-04-16 12:58:14 UTC (rev 48670)
@@ -99,8 +99,11 @@
 			// Lookup node again, since the nodetable it was in may have been reallocated
 			curNode = _s->_segMan->lookupNode(curAddress);
 		}
-		curAddress = curNode->succ;
-		curNode = _s->_segMan->lookupNode(curAddress);
+
+		if (curNode) {
+			curAddress = curNode->succ;
+			curNode = _s->_segMan->lookupNode(curAddress);
+		}
 	}
 	return true;
 }


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