diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-07-28 22:18:57 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-07-28 22:18:57 (GMT) |
| commit | bc3478043d3f00d0b5e75d9b3e4b37351d5a0ff0 (patch) | |
| tree | a45dc23d8cc06a145308760fcb2d079e23f1cbad /Lib/zipfile.py | |
| parent | 06c3369e34ffaf12722f307c65dfb06605b2e67b (diff) | |
| download | cpython-bc3478043d3f00d0b5e75d9b3e4b37351d5a0ff0.zip cpython-bc3478043d3f00d0b5e75d9b3e4b37351d5a0ff0.tar.gz cpython-bc3478043d3f00d0b5e75d9b3e4b37351d5a0ff0.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/zipfile.py')
| -rw-r--r-- | Lib/zipfile.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index de06d82..0cfa37e 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -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 |