From fb8fafaf560b5546858312cd4f552d04b149ab5a Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 27 Feb 2009 19:50:22 +0000
Subject: Fix reading corrupted saves.

svn-id: r38934
---
 engines/sci/engine/savegame.cfsml | 17 ++++++++++++++---
 engines/sci/engine/savegame.cpp   | 21 ++++++++++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml
index e59467ed60..58f8f88a36 100644
--- a/engines/sci/engine/savegame.cfsml
+++ b/engines/sci/engine/savegame.cfsml
@@ -1045,9 +1045,16 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	retval->gfx_state = s->gfx_state;
 
 	SavegameMetadata *meta = new SavegameMetadata;
-	memset(meta, 0, sizeof(SavegameMetadata));
 
-	%CFSMLREAD-ATOMIC SavegameMetadata meta FROM fh ERRVAR read_eof;
+	if (read_eof) {
+		// TODO: It would be nice to automate this:
+		meta->savegame_name = NULL;
+		meta->game_version = NULL;
+		return false;
+	}
+
+%CFSMLREAD-ATOMIC SavegameMetadata meta FROM fh ERRVAR read_eof;
+
 	if ((meta->savegame_version < FREESCI_MINIMUM_SAVEGAME_VERSION) ||
 	    (meta->savegame_version > FREESCI_CURRENT_SAVEGAME_VERSION)) {
 		if (meta->savegame_version < FREESCI_MINIMUM_SAVEGAME_VERSION)
@@ -1178,8 +1185,12 @@ bool get_savegame_metadata(Common::SeekableReadStream* stream, SavegameMetadata*
 
 	%CFSMLREAD-ATOMIC SavegameMetadata meta FROM stream ERRVAR read_eof;
 
-	if (read_eof)
+	if (read_eof) {
+		// TODO: It would be nice to automate this:
+		meta->savegame_name = NULL;
+		meta->game_version = NULL;
 		return false;
+	}
 
 	if ((meta->savegame_version < FREESCI_MINIMUM_SAVEGAME_VERSION) ||
 	    (meta->savegame_version > FREESCI_CURRENT_SAVEGAME_VERSION)) {
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index da8389167f..bea7f688cb 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -5109,7 +5109,13 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	retval->gfx_state = s->gfx_state;
 
 	SavegameMetadata *meta = new SavegameMetadata;
-	memset(meta, 0, sizeof(SavegameMetadata));
+
+	if (read_eof) {
+		// TODO: It would be nice to automate this:
+		meta->savegame_name = NULL;
+		meta->game_version = NULL;
+		return false;
+	}
 
 // Auto-generated CFSML data reader code
 #line 762 "engines/sci/engine/savegame.cfsml"
@@ -5143,7 +5149,8 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 		}
 	}
 // End of auto-generated CFSML data reader code
-#line 1051 "engines/sci/engine/savegame.cfsml"
+#line 1057 "engines/sci/engine/savegame.cfsml"
+
 	if ((meta->savegame_version < FREESCI_MINIMUM_SAVEGAME_VERSION) ||
 	    (meta->savegame_version > FREESCI_CURRENT_SAVEGAME_VERSION)) {
 		if (meta->savegame_version < FREESCI_MINIMUM_SAVEGAME_VERSION)
@@ -5198,7 +5205,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 		}
 	}
 // End of auto-generated CFSML data reader code
-#line 1074 "engines/sci/engine/savegame.cfsml"
+#line 1081 "engines/sci/engine/savegame.cfsml"
 
 	sfx_exit(&s->sound);
 	_gamestate_unfrob(retval);
@@ -5336,10 +5343,14 @@ bool get_savegame_metadata(Common::SeekableReadStream* stream, SavegameMetadata*
 		}
 	}
 // End of auto-generated CFSML data reader code
-#line 1180 "engines/sci/engine/savegame.cfsml"
+#line 1187 "engines/sci/engine/savegame.cfsml"
 
-	if (read_eof)
+	if (read_eof) {
+		// TODO: It would be nice to automate this:
+		meta->savegame_name = NULL;
+		meta->game_version = NULL;
 		return false;
+	}
 
 	if ((meta->savegame_version < FREESCI_MINIMUM_SAVEGAME_VERSION) ||
 	    (meta->savegame_version > FREESCI_CURRENT_SAVEGAME_VERSION)) {
-- 
cgit v1.2.3