From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 24 Jan 2010 03:36:35 +0000 (-0000)
Subject: Bug #301926 - Handle ValueError in parseManifest2(), triggered by corrupt
X-Git-Tag: v2.2_rc62~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e831b40d5130bce96a6243e80836f5d373f1527;p=portage.git

Bug #301926 - Handle ValueError in parseManifest2(), triggered by corrupt
manifest entry.

svn path=/main/trunk/; revision=15207
---

diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 40a8d77b6..fc8afb4cf 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -59,7 +59,10 @@ def parseManifest2(mysplit):
 	if len(mysplit) > 4 and mysplit[0] in portage.const.MANIFEST2_IDENTIFIERS:
 		mytype = mysplit[0]
 		myname = mysplit[1]
-		mysize = int(mysplit[2])
+		try:
+			mysize = int(mysplit[2])
+		except ValueError:
+			return None
 		myhashes = dict(zip(mysplit[3::2], mysplit[4::2]))
 		myhashes["size"] = mysize
 		myentry = Manifest2Entry(type=mytype, name=myname, hashes=myhashes)