MERGE: Closes #16112: platform.architecture does not correctly escape argument to /usr/bin/file

3 files changed, 12 insertions, 5 deletions

diff --git a/Lib/platform.py b/Lib/platform.py
index b653822..dd318fe 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -112,7 +112,7 @@ __copyright__ = """
 __version__ = '1.0.7'
 
 import collections
-import sys, os, re
+import sys, os, re, subprocess
 
 ### Globals & Constants
 
@@ -922,13 +922,16 @@ def _syscmd_file(target,default=''):
     if sys.platform in ('dos','win32','win16','os2'):
         # XXX Others too ?
         return default
-    target = _follow_symlinks(target).replace('"', '\\"')
+    target = _follow_symlinks(target)
     try:
-        f = os.popen('file -b "%s" 2> %s' % (target, DEV_NULL))
+        with open(DEV_NULL) as dev_null:
+            proc = subprocess.Popen(['file', '-b', '--', target],
+                     stdout=subprocess.PIPE, stderr=dev_null)
+
     except (AttributeError,os.error):
         return default
-    output = f.read().strip()
-    rc = f.close()
+    output = proc.stdout.read()
+    rc = proc.wait()
     if not output or rc:
         return default
     else:
diff --git a/Misc/ACKS b/Misc/ACKS
index 272b994..b137613 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -93,6 +93,7 @@ Ben Bell
 Thomas Bellman
 Alexander “Саша” Belopolsky
 Eli Bendersky
+David Benjamin
 Andrew Bennetts
 Andy Bensky
 Bennett Benson
diff --git a/Misc/NEWS b/Misc/NEWS
index aada4df..4051d2b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@ Library
 - Issue #16034: Fix performance regressions in the new `bz2.BZ2File`
   implementation.  Initial patch by Serhiy Storchaka.
 
+- Issue #16112: platform.architecture does not correctly escape argument to
+  /usr/bin/file.  Patch by David Benjamin.
+
 - Issue #15756: `subprocess.poll()` now properly handles `errno.ECHILD` to
   return a returncode of 0 when the child has already exited or cannot be waited
   on.