diff options
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 7 insertions, 1 deletions
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 |