[Python-checkins] r68678 - python/trunk/Lib/zipfile.py
amaury.forgeotdarc
python-checkins at python.org
Sat Jan 17 23:43:51 CET 2009
Author: amaury.forgeotdarc
Date: Sat Jan 17 23:43:50 2009
New Revision: 68678
Log:
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".
Modified:
python/trunk/Lib/zipfile.py
Modified: python/trunk/Lib/zipfile.py
==============================================================================
--- python/trunk/Lib/zipfile.py (original)
+++ python/trunk/Lib/zipfile.py Sat Jan 17 23:43:50 2009
@@ -208,13 +208,9 @@
# Append a blank comment and record start offset
endrec.append("")
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"
@@ -235,11 +231,10 @@
# 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
More information about the Python-checkins
mailing list