From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 31 Oct 2006 23:25:37 +0000 (-0000)
Subject: For bug #153295, make load_infodir ignore files that contain null bytes.
X-Git-Tag: v2.1.2~523
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59b77c7048c0095c08a2de66e97fb956b89853a7;p=portage.git

For bug #153295, make load_infodir ignore files that contain null bytes.

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

diff --git a/pym/portage.py b/pym/portage.py
index adb97c502..400d87b91 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1497,11 +1497,17 @@ class config:
 				self.configdict["pkg"]["PORT_ENV_FILE"] = infodir+"/environment"
 
 			myre = re.compile('^[A-Z]+$')
+			null_byte = "\0"
 			for filename in listdir(infodir,filesonly=1,EmptyOnError=1):
 				if myre.match(filename):
 					try:
-						mydata = string.strip(open(infodir+"/"+filename).read())
+						file_path = os.path.join(infodir, filename)
+						mydata = open(file_path).read().strip()
 						if len(mydata) < 2048 or filename == "USE":
+							if null_byte in mydata:
+								writemsg("!!! Null byte found in metadata " + \
+									"file: '%s'\n" % file_path, noiselevel=-1)
+								continue
 							if filename == "USE":
 								binpkg_flags = "-* " + mydata
 								self.configdict["pkg"][filename] = binpkg_flags