mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 74246 via svnmerge from

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

................
  r74246 | amaury.forgeotdarc | 2009-07-28 18:18:57 -0400 (Tue, 28 Jul 2009) | 10 lines

  Merged revisions 74245 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r74245 | amaury.forgeotdarc | 2009-07-29 00:15:30 +0200 (mer., 29 juil. 2009) | 3 lines

    #6511: ZipFile will now raise BadZipfile when opening an empty or tiny file,
    like it does for larger invalid files.
  ........
................
This commit is contained in:
R. David Murray 2010-01-06 20:12:07 +00:00
parent 875e1e7b7c
commit 93a59653a4
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/zipfile.py
View file

@ -200,7 +200,10 @@ def _EndRecData(fpin):
# Check to see if this is ZIP file with no archive comment (the
# "end of central directory" structure should be the last item in the
# file if this is the case).
fpin.seek(-sizeEndCentDir, 2)
try:
fpin.seek(-sizeEndCentDir, 2)
except IOError:
return None
data = fpin.read()
if data[0:4] == stringEndArchive and data[-2:] == b"\000\000":
# the signature is correct and there's no comment, unpack structure