summaryrefslogtreecommitdiff
path: root/Lib/mimetypes.py
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-03-10 13:17:21 -0700
committerSteve Dower <steve.dower@microsoft.com>2015-03-10 13:17:21 -0700
commitebb8c2d528e07df71c345826fc1290327b1e369e (patch)
tree9739a7fbf0cce0001020c82c8e858b67ebb4e56b /Lib/mimetypes.py
parent7a82afee70425782d27f4ed2c6d0bad3aeb91f09 (diff)
downloadcpython-git-ebb8c2d528e07df71c345826fc1290327b1e369e.tar.gz
Issue #22028: Ensure mimetypes will not open registry keys with embedded nulls
Diffstat (limited to 'Lib/mimetypes.py')
-rw-r--r--Lib/mimetypes.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py
index b98c8749f6..d64726b80f 100644
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -246,7 +246,8 @@ class MimeTypes:
except EnvironmentError:
break
else:
- yield ctype
+ if '\0' not in ctype:
+ yield ctype
i += 1
with _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, '') as hkcr: