Skip to content

Commit cfbb394

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #21866: ZipFile.close() no longer writes ZIP64 central directory
records if allowZip64 is false.
1 parent 8aa8c47 commit cfbb394

3 files changed

Lines changed: 66 additions & 20 deletions

File tree

‎Lib/test/test_zipfile64.py‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from io import StringIO
1919
from tempfile import TemporaryFile
2020

21-
from test.support import TESTFN, run_unittest, requires_zlib
21+
from test.support import TESTFN, requires_zlib
2222

2323
TESTFN2 = TESTFN + "2"
2424

@@ -92,7 +92,7 @@ class OtherTests(unittest.TestCase):
9292
def testMoreThan64kFiles(self):
9393
# This test checks that more than 64k files can be added to an archive,
9494
# and that the resulting archive can be read properly by ZipFile
95-
zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False)
95+
zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=True)
9696
zipf.debug = 100
9797
numfiles = (1 << 16) * 3//2
9898
for i in range(numfiles):
@@ -105,14 +105,47 @@ def testMoreThan64kFiles(self):
105105
for i in range(numfiles):
106106
content = zipf2.read("foo%08d" % i).decode('ascii')
107107
self.assertEqual(content, "%d" % (i**3 % 57))
108+
zipf2.close()
109+
110+
def testMoreThan64kFilesAppend(self):
111+
zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False)
112+
zipf.debug = 100
113+
numfiles = (1 << 16) - 1
114+
for i in range(numfiles):
115+
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
116+
self.assertEqual(len(zipf.namelist()), numfiles)
117+
with self.assertRaises(zipfile.LargeZipFile):
118+
zipf.writestr("foo%08d" % numfiles, b'')
119+
self.assertEqual(len(zipf.namelist()), numfiles)
108120
zipf.close()
109121

122+
zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=False)
123+
zipf.debug = 100
124+
self.assertEqual(len(zipf.namelist()), numfiles)
125+
with self.assertRaises(zipfile.LargeZipFile):
126+
zipf.writestr("foo%08d" % numfiles, b'')
127+
self.assertEqual(len(zipf.namelist()), numfiles)
128+
zipf.close()
129+
130+
zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=True)
131+
zipf.debug = 100
132+
self.assertEqual(len(zipf.namelist()), numfiles)
133+
numfiles2 = (1 << 16) * 3//2
134+
for i in range(numfiles, numfiles2):
135+
zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
136+
self.assertEqual(len(zipf.namelist()), numfiles2)
137+
zipf.close()
138+
139+
zipf2 = zipfile.ZipFile(TESTFN, mode="r")
140+
self.assertEqual(len(zipf2.namelist()), numfiles2)
141+
for i in range(numfiles2):
142+
content = zipf2.read("foo%08d" % i).decode('ascii')
143+
self.assertEqual(content, "%d" % (i**3 % 57))
144+
zipf2.close()
145+
110146
def tearDown(self):
111147
support.unlink(TESTFN)
112148
support.unlink(TESTFN2)
113149

114-
def test_main():
115-
run_unittest(TestsWithSourceFile, OtherTests)
116-
117150
if __name__ == "__main__":
118-
test_main()
151+
unittest.main()

‎Lib/zipfile.py‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class LargeZipFile(Exception):
5050

5151

5252
ZIP64_LIMIT = (1 << 31) - 1
53-
ZIP_FILECOUNT_LIMIT = 1 << 16
53+
ZIP_FILECOUNT_LIMIT = (1 << 16) - 1
5454
ZIP_MAX_COMMENT = (1 << 16) - 1
5555

5656
# constants for Zip file compression methods
@@ -1304,13 +1304,17 @@ def _writecheck(self, zinfo):
13041304
raise RuntimeError(
13051305
"Attempt to write ZIP archive that was already closed")
13061306
_check_compression(zinfo.compress_type)
1307-
if zinfo.file_size > ZIP64_LIMIT:
1308-
if not self._allowZip64:
1309-
raise LargeZipFile("Filesize would require ZIP64 extensions")
1310-
if zinfo.header_offset > ZIP64_LIMIT:
1311-
if not self._allowZip64:
1312-
raise LargeZipFile(
1313-
"Zipfile size would require ZIP64 extensions")
1307+
if not self._allowZip64:
1308+
requires_zip64 = None
1309+
if len(self.filelist) >= ZIP_FILECOUNT_LIMIT:
1310+
requires_zip64 = "Files count"
1311+
elif zinfo.file_size > ZIP64_LIMIT:
1312+
requires_zip64 = "Filesize"
1313+
elif zinfo.header_offset > ZIP64_LIMIT:
1314+
requires_zip64 = "Zipfile size"
1315+
if requires_zip64:
1316+
raise LargeZipFile(requires_zip64 +
1317+
" would require ZIP64 extensions")
13141318

13151319
def write(self, filename, arcname=None, compress_type=None):
13161320
"""Put the bytes from filename into the archive under the name
@@ -1464,10 +1468,8 @@ def close(self):
14641468

14651469
try:
14661470
if self.mode in ("w", "a") and self._didModify: # write ending records
1467-
count = 0
14681471
pos1 = self.fp.tell()
14691472
for zinfo in self.filelist: # write central directory
1470-
count = count + 1
14711473
dt = zinfo.date_time
14721474
dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
14731475
dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
@@ -1531,13 +1533,21 @@ def close(self):
15311533

15321534
pos2 = self.fp.tell()
15331535
# Write end-of-zip-archive record
1534-
centDirCount = count
1536+
centDirCount = len(self.filelist)
15351537
centDirSize = pos2 - pos1
15361538
centDirOffset = pos1
1537-
if (centDirCount >= ZIP_FILECOUNT_LIMIT or
1538-
centDirOffset > ZIP64_LIMIT or
1539-
centDirSize > ZIP64_LIMIT):
1539+
requires_zip64 = None
1540+
if centDirCount > ZIP_FILECOUNT_LIMIT:
1541+
requires_zip64 = "Files count"
1542+
elif centDirOffset > ZIP64_LIMIT:
1543+
requires_zip64 = "Central directory offset"
1544+
elif centDirSize > ZIP64_LIMIT:
1545+
requires_zip64 = "Central directory size"
1546+
if requires_zip64:
15401547
# Need to write the ZIP64 end-of-archive records
1548+
if not self._allowZip64:
1549+
raise LargeZipFile(requires_zip64 +
1550+
" would require ZIP64 extensions")
15411551
zip64endrec = struct.pack(
15421552
structEndArchive64, stringEndArchive64,
15431553
44, 45, 45, 0, 0, centDirCount, centDirCount,

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Core and Builtins
1313
Library
1414
-------
1515

16+
- Issue #21866: ZipFile.close() no longer writes ZIP64 central directory
17+
records if allowZip64 is false.
18+
1619
- Issue #22415: Fixed debugging output of the GROUPREF_EXISTS opcode in the re
1720
module. Removed trailing spaces in debugging output.
1821

0 commit comments

Comments
 (0)