Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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".
........
This commit is contained in:
Amaury Forgeot d'Arc 2009-01-18 20:27:45 +00:00
parent afd7eaadb0
commit 945fdd6e6d
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/zipfile.py
View File

@ -196,13 +196,9 @@ def _EndRecData(fpin):
# Append a blank comment and record start offset # Append a blank comment and record start offset
endrec.append("") endrec.append("")
endrec.append(filesize - sizeEndCentDir) 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 # 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" # comment. Search the end of the file for the "end of central directory"
@ -223,11 +219,10 @@ def _EndRecData(fpin):
# Append the archive comment and start offset # Append the archive comment and start offset
endrec.append(comment) endrec.append(comment)
endrec.append(maxCommentStart + start) endrec.append(maxCommentStart + start)
if endrec[_ECD_OFFSET] == 0xffffffff:
# There is apparently a "Zip64 end of central directory" # Try to read the "Zip64 end of central directory" structure
# structure present, so go look for it return _EndRecData64(fpin, maxCommentStart + start - filesize,
return _EndRecData64(fpin, start - filesize, endrec) endrec)
return endrec
# Unable to find a valid end of central directory structure # Unable to find a valid end of central directory structure
return return