Commit 69e7c9b1 authored by Jesus Cea's avatar Jesus Cea

#16112: platform.architecture does not correctly escape argument to...

#16112: platform.architecture does not correctly escape argument to /usr/bin/file. Use 'communicate()'
parent 45c0766c
...@@ -1045,13 +1045,12 @@ def _syscmd_file(target,default=''): ...@@ -1045,13 +1045,12 @@ def _syscmd_file(target,default=''):
return default return default
target = _follow_symlinks(target) target = _follow_symlinks(target)
try: try:
with open(DEV_NULL) as dev_null:
proc = subprocess.Popen(['file', '-b', '--', target], proc = subprocess.Popen(['file', '-b', '--', target],
stdout=subprocess.PIPE, stderr=dev_null) stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
except (AttributeError,os.error): except (AttributeError,os.error):
return default return default
output = proc.stdout.read() output = proc.communicate()[0]
rc = proc.wait() rc = proc.wait()
if not output or rc: if not output or rc:
return default return default
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment