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

[dhewg at users.sourceforge.net]

Revision: 38889
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38889&view=rev
Author:   dhewg
Date:     2009-02-25 23:50:16 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
fix read_SegManagerPtr to not read from an uninitialzed pointer

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

Modified: scummvm/trunk/engines/sci/engine/savegame.cfsml
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cfsml	2009-02-25 21:43:57 UTC (rev 38888)
+++ scummvm/trunk/engines/sci/engine/savegame.cfsml	2009-02-25 23:50:16 UTC (rev 38889)
@@ -717,7 +717,7 @@
 	char *token;
 	int assignment;
 	bool sci11;
-	%CFSMLREAD bool (&sci11) FROM fh ERRVAR *hiteof FIRSTTOKEN token LINECOUNTER *line;
+	%CFSMLREAD bool (&sci11) FROM fh ERRVAR *hiteof FIRSTTOKEN lastval LINECOUNTER *line;
 	*foo = new SegManager(sci11);
 	token = _cfsml_get_identifier(fh, line, hiteof, &assignment);
 	%CFSMLREAD SegManager (*foo) FROM fh ERRVAR *hiteof FIRSTTOKEN token LINECOUNTER *line;

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-02-25 21:43:57 UTC (rev 38888)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-02-25 23:50:16 UTC (rev 38889)
@@ -4729,7 +4729,7 @@
 #line 773 "engines/sci/engine/savegame.cfsml"
 		int _cfsml_eof = 0, _cfsml_error;
 #line 777 "engines/sci/engine/savegame.cfsml"
-		const char *_cfsml_inp = token;
+		const char *_cfsml_inp = lastval;
 		{
 #line 788 "engines/sci/engine/savegame.cfsml"
 			_cfsml_error = _cfsml_read_bool(fh, (&sci11), _cfsml_inp, &(*line), &_cfsml_eof);


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