diff options
| author | Gregory P. Smith <greg@mad-scientist.com> | 2009-06-26 08:05:13 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@mad-scientist.com> | 2009-06-26 08:05:13 (GMT) |
| commit | e88749b47585b848ffc0cf40760526b937119474 (patch) | |
| tree | d1b9b35f9c5c412647727d14e72453ae961434d7 | |
| parent | 619de8f107b854fc1a5b91f300c89253d5802cd5 (diff) | |
| download | cpython-e88749b47585b848ffc0cf40760526b937119474.zip cpython-e88749b47585b848ffc0cf40760526b937119474.tar.gz cpython-e88749b47585b848ffc0cf40760526b937119474.tar.bz2 | |
Merged revisions 73565 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73565 | gregory.p.smith | 2009-06-26 00:50:21 -0700 (Fri, 26 Jun 2009) | 2 lines
Fixes the last problem mentioned in issue1202.
........
Issue #1202: zipfile module would cause a struct.error when attempting to store
files with a CRC32 > 2**31-1. (on trunk this was merely a warning, in the py3k
branch this caused an exception so I'm treating this as a release blocker and
merging it now)
| -rw-r--r-- | Lib/zipfile.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 5f24187..de06d82 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1132,7 +1132,7 @@ class ZipFile: self.fp.flush() 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 @@ -32,6 +32,9 @@ Library - Issue #6271: mmap tried to close invalid file handle (-1) when anonymous. (On Unix) +- Issue #1202: zipfile module would cause a struct.error when attempting to + store files with a CRC32 > 2**31-1. + Extension Modules ----------------- |