Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 23:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 66240 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66240 | antoine.pitrou | 2008-09-06 01:30:23 +0200 (sam., 06 sept. 2008) | 5 lines

  Issue #3535: zipfile couldn't read some zip files larger than 2GB.

  Reviewed by Amaury Forgeot d'Arc.
........
This commit is contained in:
Antoine Pitrou 2008-09-05 23:43:02 +00:00
parent 791dc2f32c
commit 9e4fdf446d
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/zipfile.py
View file

@ -165,6 +165,7 @@ def _EndRecData64(fpin, offset, endrec):
return endrec
# Update the original endrec using data from the ZIP64 record
endrec[_ECD_SIGNATURE] = sig
endrec[_ECD_DISK_NUMBER] = disk_num
endrec[_ECD_DISK_START] = disk_dir
endrec[_ECD_ENTRIES_THIS_DISK] = dircount
@ -733,9 +734,8 @@ def _RealGetContents(self):
# "concat" is zero, unless zip was concatenated to another file
concat = endrec[_ECD_LOCATION] - size_cd - offset_cd
if endrec[_ECD_LOCATION] > ZIP64_LIMIT:
# If the offset of the "End of Central Dir" record requires Zip64
# extension structures, account for them
if endrec[_ECD_SIGNATURE] == stringEndArchive64:
# If Zip64 extension structures are present, account for them
concat -= (sizeEndCentDir64 + sizeEndCentDir64Locator)
if self.debug > 2: