diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-01-18 00:29:02 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-01-18 00:29:02 (GMT) |
| commit | d3fb4bb450fa749ce3e5ca0e5ae17c9d2ad4236d (patch) | |
| tree | 121c5dfcf83dfb4e827d67c6dbe8a1ec298a4f95 /Lib | |
| parent | 23cbd8a6564df0ac3df339f91196c45f3e626d32 (diff) | |
| download | cpython-d3fb4bb450fa749ce3e5ca0e5ae17c9d2ad4236d.zip cpython-d3fb4bb450fa749ce3e5ca0e5ae17c9d2ad4236d.tar.gz cpython-d3fb4bb450fa749ce3e5ca0e5ae17c9d2ad4236d.tar.bz2 | |
Merged revisions 68678 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68678 | amaury.forgeotdarc | 2009-01-17 23:43:50 +0100 (Sat, 17 Jan 2009) | 3 lines
follow-up of #3997: since 0xFFFF numbers are not enough to indicate a zip64 format,
always try to read the "zip64 end of directory structure".
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/zipfile.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 149f2a6..c67bd5d 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -210,13 +210,9 @@ def _EndRecData(fpin): # Append a blank comment and record start offset endrec.append(b"") endrec.append(filesize - sizeEndCentDir) - if endrec[_ECD_OFFSET] == 0xffffffff: - # the value for the "offset of the start of the central directory" - # indicates that there is a "Zip64 end of central directory" - # structure present, so go look for it - return _EndRecData64(fpin, -sizeEndCentDir, endrec) - return endrec + # Try to read the "Zip64 end of central directory" structure + return _EndRecData64(fpin, -sizeEndCentDir, endrec) # Either this is not a ZIP file, or it is a ZIP file with an archive # comment. Search the end of the file for the "end of central directory" @@ -237,11 +233,10 @@ def _EndRecData(fpin): # Append the archive comment and start offset endrec.append(comment) endrec.append(maxCommentStart + start) - if endrec[_ECD_OFFSET] == 0xffffffff: - # There is apparently a "Zip64 end of central directory" - # structure present, so go look for it - return _EndRecData64(fpin, start - filesize, endrec) - return endrec + + # Try to read the "Zip64 end of central directory" structure + return _EndRecData64(fpin, maxCommentStart + start - filesize, + endrec) # Unable to find a valid end of central directory structure return |