From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 23 Jan 2007 21:38:58 +0000 (-0000)
Subject: For bug #142279, detect and warn about null bytes in CONTENTS.
X-Git-Tag: v2.1.2-r3~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f71a6b059e1e411dd1d3d7455ba974b9ac714e3;p=portage.git

For bug #142279, detect and warn about null bytes in CONTENTS.

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

diff --git a/pym/portage.py b/pym/portage.py
index b434b338e..eb44be8aa 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6799,8 +6799,16 @@ class dblink:
 		myc=open(self.dbdir+"/CONTENTS","r")
 		mylines=myc.readlines()
 		myc.close()
+		null_byte = "\0"
+		contents_file = os.path.join(self.dbdir, "CONTENTS")
 		pos=1
 		for line in mylines:
+			if null_byte in line:
+				# Null bytes are a common indication of corruption.
+				writemsg("!!! Null byte found in contents " + \
+					"file, line %d: '%s'\n" % (pos, contents_file),
+					noiselevel=-1)
+				continue
 			mydat = line.split()
 			# we do this so we can remove from non-root filesystems
 			# (use the ROOT var to allow maintenance on other partitions)