[Scummvm-cvs-logs] SF.net SVN: scummvm:[34563] scummvm/trunk/engines/kyra

[wjpalenstijn at users.sourceforge.net]

Revision: 34563
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34563&view=rev
Author:   wjpalenstijn
Date:     2008-09-15 19:34:06 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
also check for premature end-of-stream when loading

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/saveload_hof.cpp
    scummvm/trunk/engines/kyra/saveload_lok.cpp
    scummvm/trunk/engines/kyra/saveload_mr.cpp

Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp	2008-09-15 19:19:30 UTC (rev 34562)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp	2008-09-15 19:34:06 UTC (rev 34563)
@@ -279,7 +279,7 @@
 	_sceneExit3 = in.readUint16();
 	_sceneExit4 = in.readUint16();
 
-	if (saveFile->err())
+	if (saveFile->err() || saveFile->eos())
 		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
 	else
 		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());

Modified: scummvm/trunk/engines/kyra/saveload_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lok.cpp	2008-09-15 19:19:30 UTC (rev 34562)
+++ scummvm/trunk/engines/kyra/saveload_lok.cpp	2008-09-15 19:34:06 UTC (rev 34563)
@@ -206,7 +206,7 @@
 	_mousePressFlag = false;
 	setMousePos(brandonX, brandonY);
 	
-	if (in->err())
+	if (in->err() || in->eos())
 		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
 	else
 		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());

Modified: scummvm/trunk/engines/kyra/saveload_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_mr.cpp	2008-09-15 19:19:30 UTC (rev 34562)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp	2008-09-15 19:34:06 UTC (rev 34563)
@@ -283,7 +283,7 @@
 	_sceneExit3 = in.readUint16();
 	_sceneExit4 = in.readUint16();
 
-	if (saveFile->err())
+	if (saveFile->err() || saveFile->eos())
 		error("Load failed ('%s', '%s').", fileName, header.description.c_str());
 	else
 		debugC(1, kDebugLevelMain, "Loaded savegame '%s.'", header.description.c_str());


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