Issue #22028: Ensure mimetypes will not open registry keys with embedded nulls

9561597c · Steve Dower · b84e8b5f · 9561597c
Commit 9561597c authored Mar 10, 2015 by Steve Dower
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Lib/mimetypes.py Lib/mimetypes.py +4 -1

No files found.
--- a/Lib/mimetypes.py
+++ b/Lib/mimetypes.py
@@ -242,9 +242,12 @@ class MimeTypes:
            i = 0
            while True:
                try:
-                    yield _winreg.EnumKey(mimedb, i)
+                    ctype = _winreg.EnumKey(mimedb, i)
                except EnvironmentError:
                    break
+                else:
+                    if '\0' not in ctype:
+                        yield ctype
                i += 1
        default_encoding = sys.getdefaultencoding()