zipfile now handles file sizes over 2 GB. Was incorrectly storing file sizes

as signed when the ZIP spec says they should be stored as unsigned.

Closes bug #679953.

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index b1943c17a920e3cbe451ca9e6948c16b17b68ed9..95dfbc00519585294dda0e2f59c1bf73d340c8d8 100644 (file)
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -23,9 +23,9 @@ ZIP_DEFLATED = 8
 # Here are some struct module formats for reading headers
 structEndArchive = "<4s4H2lH"     # 9 items, end of archive, 22 bytes
 stringEndArchive = "PK\005\006"   # magic number for end of archive record
-structCentralDir = "<4s4B4H3l5HLl"# 19 items, central directory, 46 bytes
+structCentralDir = "<4s4B4HlLL5HLl"# 19 items, central directory, 46 bytes
 stringCentralDir = "PK\001\002"   # magic number for central directory
-structFileHeader = "<4s2B4H3l2H"  # 12 items, file header record, 30 bytes
+structFileHeader = "<4s2B4HlLL2H"  # 12 items, file header record, 30 bytes
 stringFileHeader = "PK\003\004"   # magic number for file header
 
 # indexes of entries in the central directory structure
@@ -439,7 +439,7 @@ class ZipFile:
         # Seek backwards and write CRC and file sizes
         position = self.fp.tell()       # Preserve current position in file
         self.fp.seek(zinfo.header_offset + 14, 0)
-        self.fp.write(struct.pack("<lll", zinfo.CRC, zinfo.compress_size,
+        self.fp.write(struct.pack("<lLL", zinfo.CRC, zinfo.compress_size,
               zinfo.file_size))
         self.fp.seek(position, 0)
         self.filelist.append(zinfo)
@@ -471,7 +471,7 @@ class ZipFile:
         self.fp.write(bytes)
         if zinfo.flag_bits & 0x08:
             # Write CRC and file sizes after the file data
-            self.fp.write(struct.pack("<lll", zinfo.CRC, zinfo.compress_size,
+            self.fp.write(struct.pack("<lLL", zinfo.CRC, zinfo.compress_size,
                   zinfo.file_size))
         self.filelist.append(zinfo)
         self.NameToInfo[zinfo.filename] = zinfo

diff --git a/Misc/NEWS b/Misc/NEWS
index f1fbc8155a0891da9dfc0031fe9af12607668567..5d736ee95947683748a30433aa59a4e0e3364eec 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,6 +39,10 @@ Extension modules
 
 Library
 -------
+
+- Bug #679953: zipfile can now handle file sizes over 2 GB.  Previously the
+  compressed and uncompressed file sizes were being stored as signed longs
+  instead of unsigned as the ZIP spec specifies.
   
 - Bug #981530: Fix UnboundLocalError in shutil.rmtree().  This affects
   the documented behavior: the function passed to the onerror()