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

[waltervn at users.sourceforge.net]

Revision: 47964
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47964&view=rev
Author:   waltervn
Date:     2010-02-07 14:32:49 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
SCI: Fix VM crash when NULL_REG is passed to AvoidPath (SCI32).

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-02-07 12:16:45 UTC (rev 47963)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-02-07 14:32:49 UTC (rev 47964)
@@ -1392,7 +1392,7 @@
 			if (argc < 7)
 				error("[avoidpath] Not enough arguments");
 
-			poly_list = GET_SEL32(s->_segMan, argv[4], SELECTOR(elements));
+			poly_list = (!argv[4].isNull() ? GET_SEL32(s->_segMan, argv[4], SELECTOR(elements)) : NULL_REG);
 			width = argv[5].toUint16();
 			height = argv[6].toUint16();
 			if (argc > 7)


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