From b1df1e164c7356e419957c88b4690f3d10c5ec7a Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Sun, 19 Aug 2012 18:57:29 +0100
Subject: [PATCH] Catch exceptions when loading initial stamp

---
 src/client/Client.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 0f6273c51..ad5e458b5 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -818,8 +818,16 @@ SaveFile * Client::GetStamp(std::string stampID)
 		stampFile.close();
 
 		SaveFile * file = new SaveFile(std::string(stampID).c_str());
-		GameSave * tempSave = new GameSave((char *)tempData, fileSize);
-		file->SetGameSave(tempSave);
+		GameSave * tempSave = NULL;
+		try
+		{
+			GameSave * tempSave = new GameSave((char *)tempData, fileSize);
+			file->SetGameSave(tempSave);
+		}
+		catch (ParseException & e)
+		{
+			std::cerr << "Client: Invalid stamp file, " << stampID << " " << std::string(e.what()) << std::endl;
+		}
 		return file;
 	}
 	else