From: Just van Rossum <just@letterror.com>
Date: Thu, 5 Jul 2001 07:03:16 +0000 (+0000)
Subject: don't crash when encountering bad marshal data
X-Git-Tag: v2.2a3~1343
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=924e18e0b8d39a961e8d008ebcf3d43c9eee70db;p=thirdparty%2FPython%2Fcpython.git

don't crash when encountering bad marshal data
---

diff --git a/Mac/Tools/IDE/MacPrefs.py b/Mac/Tools/IDE/MacPrefs.py
index f8888fcf34f5..b1fa7cabcc9f 100644
--- a/Mac/Tools/IDE/MacPrefs.py
+++ b/Mac/Tools/IDE/MacPrefs.py
@@ -50,7 +50,8 @@ class PrefFile(PrefObject):
 		self._prefsdict = {}
 		try:
 			prefdict = marshal.load(open(self.__path, 'rb'))
-		except IOError:
+		except (IOError, ValueError):
+			# file not found, or currupt marshal data
 			pass
 		else:
 			for key, value in prefdict.items():