[Scummvm-cvs-logs] SF.net SVN: scummvm:[52197] scummvm/trunk/engines/sci/engine/kpathing.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Aug 18 22:41:05 CEST 2010


Revision: 52197
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52197&view=rev
Author:   thebluegr
Date:     2010-08-18 20:41:03 +0000 (Wed, 18 Aug 2010)

Log Message:
-----------
SCI: Fixed bug #3041232 - "LB2Floppy: Crash at Museum"

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kpathing.cpp

Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-08-18 20:28:48 UTC (rev 52196)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-08-18 20:41:03 UTC (rev 52197)
@@ -1186,7 +1186,9 @@
 		Node *node = s->_segMan->lookupNode(list->first);
 
 		while (node) {
-			polygon = convert_polygon(s, node->value);
+			// The node value might be null, in which case there's no polygon to parse.
+			// Happens in LB2 floppy - refer to bug #3041232
+			polygon = !node->value.isNull() ? convert_polygon(s, node->value) : NULL;
 
 			if (polygon) {
 				pf_s->polygons.push_back(polygon);


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