From ad51cdd88f82e58a16ffcaf0d72d17bb169a1e0e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 23 Jan 2007 21:43:40 +0000 Subject: For bug #142279, detect and warn about null bytes in CONTENTS. (trunk r5762:5763) svn path=/main/branches/2.1.2/; revision=5764 --- pym/portage.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index 667066597..f4d31a1ec 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6734,8 +6734,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) -- cgit v1.2.3-1-g7c22