diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-01-06 20:08:02 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-01-06 20:08:02 (GMT) |
| commit | 981130bf93b7576e9e7290cb0449b532b508e0c4 (patch) | |
| tree | 0351e1c775d55c083118011fb56499f2a5dc8ddd /Lib/zipfile.py | |
| parent | 8b1587fd63ae3c783a772f86f63593d7f65bb6db (diff) | |
| download | cpython-981130bf93b7576e9e7290cb0449b532b508e0c4.zip cpython-981130bf93b7576e9e7290cb0449b532b508e0c4.tar.gz cpython-981130bf93b7576e9e7290cb0449b532b508e0c4.tar.bz2 | |
Merged revisions 74245 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74245 | amaury.forgeotdarc | 2009-07-28 18:15:30 -0400 (Tue, 28 Jul 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 e2ede45..34b3f1a 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -186,7 +186,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:] == "\000\000": # the signature is correct and there's no comment, unpack structure |