diff options
author | Gregory P. Smith <greg@mad-scientist.com> | 2008-01-19 23:10:52 (GMT) |
---|---|---|
committer | Gregory P. Smith <greg@mad-scientist.com> | 2008-01-19 23:10:52 (GMT) |
commit | 350d03b18aeadc2292866a9df5a38cfa58785e10 (patch) | |
tree | d253ac28630e3b99112aa3ccbb829f07689739fc | |
parent | 70eb2f91b45e126ca8219d965b1d14968b0405cc (diff) | |
download | cpython-350d03b18aeadc2292866a9df5a38cfa58785e10.zip cpython-350d03b18aeadc2292866a9df5a38cfa58785e10.tar.gz cpython-350d03b18aeadc2292866a9df5a38cfa58785e10.tar.bz2 |
Fixes/Accepts Patch for issue1189216 - Work properly with archives
that have file headers past the 2**31 byte boundary.
-rw-r--r-- | Lib/zipfile.py | 4 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 471cffc..eb00b34 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -32,9 +32,9 @@ ZIP_DEFLATED = 8 # Other ZIP compression methods not supported # Here are some struct module formats for reading headers -structEndArchive = "<4s4H2lH" # 9 items, end of archive, 22 bytes +structEndArchive = "<4s4H2LH" # 9 items, end of archive, 22 bytes stringEndArchive = "PK\005\006" # magic number for end of archive record -structCentralDir = "<4s4B4HlLL5HLl"# 19 items, central directory, 46 bytes +structCentralDir = "<4s4B4HlLL5HLL"# 19 items, central directory, 46 bytes stringCentralDir = "PK\001\002" # magic number for central directory structFileHeader = "<4s2B4HlLL2H" # 12 items, file header record, 30 bytes stringFileHeader = "PK\003\004" # magic number for file header @@ -369,6 +369,9 @@ Core and builtins Library ------- +- #1189216: Fix the zipfile module to work on archives with headers + past the 2**31 byte boundary. + - #1336: fix a race condition in subprocess.Popen if the garbage collector kicked in at the wrong time that would cause the process to hang when the child wrote to stderr. |