Strip bad fields for local entry

Author: danny0838

Lib/test/test_zipfile/test_core.py

@@ -1217,6 +1217,28 @@ def test_generated_valid_zip64_extra_in_local_entry(self):
             b'zzz'
         ))
 
+        # should strip zip64 field if zip64 not used
+        fh = io.BytesIO()
+        with zipfile.ZipFile(fh, 'w') as zh:
+            zinfo = zipfile.ZipInfo('strfile')
+            zinfo.extra = (
+                # zip64 (should be stripped)
+                b'\x01\x00\x10\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+                b'\x00\x00\x00\x00\x00\x00\x00\x00'
+
+                # invalid tail
+                b'zzz'
+            )
+            zh.writestr(zinfo, 'foo')
+
+        fh.seek(0)
+        fh.seek(zinfo.header_offset)
+        entry = fh.read(zh.start_dir - zinfo.header_offset - zinfo.compress_size)
+        header = struct.unpack_from(zipfile.structFileHeader, entry)
+        extra_bytes = entry[-header[zipfile._FH_EXTRA_FIELD_LENGTH]:]
+        self.assertEqual(extra_bytes, b'zzz')
+
     def test_force_zip64(self):
         """Test that forcing zip64 extensions correctly notes this in the zip file"""
 

Lib/zipfile/__init__.py

@@ -541,7 +541,14 @@ def FileHeader(self, zip64=None):
             compress_size = self.compress_size
             file_size = self.file_size
 
-        extra = self.extra
+        # Strip extra fields that should not exist in the local entry or should
+        # be determined later. (self.extra can be read from central directory
+        # when read in append mode)
+        extra = _Extra.strip(self.extra, (
+            0x0001,  # Zip64
+            0x0017,  # Strong Encryption Header
+            0x6375,  # Unicode Comment
+        ))
 
         min_version = 0
         if zip64 is None:
@@ -555,7 +562,7 @@ def FileHeader(self, zip64=None):
             extra = struct.pack(
                 fmt, 1, struct.calcsize(fmt)-4,
                 file_size, compress_size
-            ) + _Extra.strip(extra, (1,))
+            ) + extra
 
             file_size = 0xffffffff
             compress_size = 0xffffffff