[Python-checkins] cpython (merge 3.4 -> default): Issue #21866: ZipFile.close() no longer writes ZIP64 central directory

Tue Sep 23 20:40:47 CEST 2014

https://hg.python.org/cpython/rev/d361d2176121
changeset: 92538:d361d2176121
parent: 92535:e9e790ea071c
parent: 92537:8f25d118ce38
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Sep 23 21:35:57 2014 +0300
summary:
 Issue #21866: ZipFile.close() no longer writes ZIP64 central directory
records if allowZip64 is false.
files:
 Lib/test/test_zipfile64.py | 45 ++++++++++++++++++++++---
 Lib/zipfile.py | 38 +++++++++++++--------
 Misc/NEWS | 3 +
 3 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/Lib/test/test_zipfile64.py b/Lib/test/test_zipfile64.py
--- a/Lib/test/test_zipfile64.py
+++ b/Lib/test/test_zipfile64.py
@@ -18,7 +18,7 @@
 from io import StringIO
 from tempfile import TemporaryFile
 
-from test.support import TESTFN, run_unittest, requires_zlib
+from test.support import TESTFN, requires_zlib
 
 TESTFN2 = TESTFN + "2"
 
@@ -92,7 +92,7 @@
 def testMoreThan64kFiles(self):
 # This test checks that more than 64k files can be added to an archive,
 # and that the resulting archive can be read properly by ZipFile
- zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False)
+ zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=True)
 zipf.debug = 100
 numfiles = (1 << 16) * 3//2
 for i in range(numfiles):
@@ -105,14 +105,47 @@
 for i in range(numfiles):
 content = zipf2.read("foo%08d" % i).decode('ascii')
 self.assertEqual(content, "%d" % (i**3 % 57))
+ zipf2.close()
+
+ def testMoreThan64kFilesAppend(self):
+ zipf = zipfile.ZipFile(TESTFN, mode="w", allowZip64=False)
+ zipf.debug = 100
+ numfiles = (1 << 16) - 1
+ for i in range(numfiles):
+ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
+ self.assertEqual(len(zipf.namelist()), numfiles)
+ with self.assertRaises(zipfile.LargeZipFile):
+ zipf.writestr("foo%08d" % numfiles, b'')
+ self.assertEqual(len(zipf.namelist()), numfiles)
 zipf.close()
 
+ zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=False)
+ zipf.debug = 100
+ self.assertEqual(len(zipf.namelist()), numfiles)
+ with self.assertRaises(zipfile.LargeZipFile):
+ zipf.writestr("foo%08d" % numfiles, b'')
+ self.assertEqual(len(zipf.namelist()), numfiles)
+ zipf.close()
+
+ zipf = zipfile.ZipFile(TESTFN, mode="a", allowZip64=True)
+ zipf.debug = 100
+ self.assertEqual(len(zipf.namelist()), numfiles)
+ numfiles2 = (1 << 16) * 3//2
+ for i in range(numfiles, numfiles2):
+ zipf.writestr("foo%08d" % i, "%d" % (i**3 % 57))
+ self.assertEqual(len(zipf.namelist()), numfiles2)
+ zipf.close()
+
+ zipf2 = zipfile.ZipFile(TESTFN, mode="r")
+ self.assertEqual(len(zipf2.namelist()), numfiles2)
+ for i in range(numfiles2):
+ content = zipf2.read("foo%08d" % i).decode('ascii')
+ self.assertEqual(content, "%d" % (i**3 % 57))
+ zipf2.close()
+
 def tearDown(self):
 support.unlink(TESTFN)
 support.unlink(TESTFN2)
 
-def test_main():
- run_unittest(TestsWithSourceFile, OtherTests)
-
 if __name__ == "__main__":
- test_main()
+ unittest.main()
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -50,7 +50,7 @@
 
 
 ZIP64_LIMIT = (1 << 31) - 1
-ZIP_FILECOUNT_LIMIT = 1 << 16
+ZIP_FILECOUNT_LIMIT = (1 << 16) - 1
 ZIP_MAX_COMMENT = (1 << 16) - 1
 
 # constants for Zip file compression methods
@@ -1304,13 +1304,17 @@
 raise RuntimeError(
 "Attempt to write ZIP archive that was already closed")
 _check_compression(zinfo.compress_type)
- if zinfo.file_size > ZIP64_LIMIT:
- if not self._allowZip64:
- raise LargeZipFile("Filesize would require ZIP64 extensions")
- if zinfo.header_offset > ZIP64_LIMIT:
- if not self._allowZip64:
- raise LargeZipFile(
- "Zipfile size would require ZIP64 extensions")
+ if not self._allowZip64:
+ requires_zip64 = None
+ if len(self.filelist) >= ZIP_FILECOUNT_LIMIT:
+ requires_zip64 = "Files count"
+ elif zinfo.file_size > ZIP64_LIMIT:
+ requires_zip64 = "Filesize"
+ elif zinfo.header_offset > ZIP64_LIMIT:
+ requires_zip64 = "Zipfile size"
+ if requires_zip64:
+ raise LargeZipFile(requires_zip64 +
+ " would require ZIP64 extensions")
 
 def write(self, filename, arcname=None, compress_type=None):
 """Put the bytes from filename into the archive under the name
@@ -1464,10 +1468,8 @@
 
 try:
 if self.mode in ("w", "a") and self._didModify: # write ending records
- count = 0
 pos1 = self.fp.tell()
 for zinfo in self.filelist: # write central directory
- count = count + 1
 dt = zinfo.date_time
 dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]
 dostime = dt[3] << 11 | dt[4] << 5 | (dt[5] // 2)
@@ -1531,13 +1533,21 @@
 
 pos2 = self.fp.tell()
 # Write end-of-zip-archive record
- centDirCount = count
+ centDirCount = len(self.filelist)
 centDirSize = pos2 - pos1
 centDirOffset = pos1
- if (centDirCount >= ZIP_FILECOUNT_LIMIT or
- centDirOffset > ZIP64_LIMIT or
- centDirSize > ZIP64_LIMIT):
+ requires_zip64 = None
+ if centDirCount > ZIP_FILECOUNT_LIMIT:
+ requires_zip64 = "Files count"
+ elif centDirOffset > ZIP64_LIMIT:
+ requires_zip64 = "Central directory offset"
+ elif centDirSize > ZIP64_LIMIT:
+ requires_zip64 = "Central directory size"
+ if requires_zip64:
 # Need to write the ZIP64 end-of-archive records
+ if not self._allowZip64:
+ raise LargeZipFile(requires_zip64 +
+ " would require ZIP64 extensions")
 zip64endrec = struct.pack(
 structEndArchive64, stringEndArchive64,
 44, 45, 45, 0, 0, centDirCount, centDirCount,
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -137,6 +137,9 @@
 Library
 -------
 
+- Issue #21866: ZipFile.close() no longer writes ZIP64 central directory
+ records if allowZip64 is false.
+
 - Issue #22278: Fix urljoin problem with relative urls, a regression observed
 after changes to issue22118 were submitted.
 
-- 
Repository URL: https://hg.python.org/cpython
