mirror of
https://github.com/python/cpython.git
synced 2025-12-04 08:34:25 +00:00
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)
This commit is contained in:
parent
619de8f107
commit
e88749b475
2 changed files with 4 additions and 1 deletions
|
|
@ -1132,7 +1132,7 @@ class ZipFile:
|
||||||
self.fp.flush()
|
self.fp.flush()
|
||||||
if zinfo.flag_bits & 0x08:
|
if zinfo.flag_bits & 0x08:
|
||||||
# Write CRC and file sizes after the file data
|
# 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))
|
zinfo.file_size))
|
||||||
self.filelist.append(zinfo)
|
self.filelist.append(zinfo)
|
||||||
self.NameToInfo[zinfo.filename] = zinfo
|
self.NameToInfo[zinfo.filename] = zinfo
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,9 @@ Library
|
||||||
- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous.
|
- Issue #6271: mmap tried to close invalid file handle (-1) when anonymous.
|
||||||
(On Unix)
|
(On Unix)
|
||||||
|
|
||||||
|
- Issue #1202: zipfile module would cause a struct.error when attempting to
|
||||||
|
store files with a CRC32 > 2**31-1.
|
||||||
|
|
||||||
Extension Modules
|
Extension Modules
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue