#10801: In zipfile, support different encodings for the header and the filenames. Patch by MvL, test by Eli Bendersky.

1 files changed, 7 insertions, 1 deletions

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 197f0bc6e1..50f484873a 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -930,7 +930,13 @@ class ZipFile:
         if fheader[_FH_EXTRA_FIELD_LENGTH]:
             zef_file.read(fheader[_FH_EXTRA_FIELD_LENGTH])
 
-        if fname != zinfo.orig_filename.encode("utf-8"):
+        if zinfo.flag_bits & 0x800:
+            # UTF-8 filename
+            fname_str = fname.decode("utf-8")
+        else:
+            fname_str = fname.decode("cp437")
+
+        if fname_str != zinfo.orig_filename:
             if not self._filePassed:
                 zef_file.close()
             raise BadZipFile(