mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-17 23:31:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#10694: zipfile now ignores garbage at the end of a zipfile.

Browse source 
Original fix by 'rep', final patch (with tests) by Xuanji Li.
This commit is contained in:
R David Murray 2011-06-09 16:01:09 -04:00
parent 5446f08c60
commit 873c583244
3 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/zipfile.py
View file

@ -236,16 +236,14 @@ def _EndRecData(fpin):
# found the magic number; attempt to unpack and interpret
recData = data[start:start+sizeEndCentDir]
endrec = list(struct.unpack(structEndArchive, recData))
comment = data[start+sizeEndCentDir:]
# check that comment length is correct
if endrec[_ECD_COMMENT_SIZE] == len(comment):
# Append the archive comment and start offset
endrec.append(comment)
endrec.append(maxCommentStart + start)
commentSize = endrec[_ECD_COMMENT_SIZE] #as claimed by the zip file
comment = data[start+sizeEndCentDir:start+sizeEndCentDir+commentSize]
endrec.append(comment)
endrec.append(maxCommentStart + start)
# Try to read the "Zip64 end of central directory" structure
return _EndRecData64(fpin, maxCommentStart + start - filesize,
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