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

ebb8c2d5 · Steve Dower · 7a82afee · ebb8c2d5
Commit ebb8c2d5 authored Mar 10, 2015 by Steve Dower
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

No files found.
--- 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: