From 93a59653a49d60abaeb69a966370b4277e0f1d3a Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Wed, 6 Jan 2010 20:12:07 +0000 Subject: [PATCH] Merged revisions 74246 via svnmerge from 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. ........ ................ --- Lib/test/test_zipfile.py | 10 ++++++++++ Lib/zipfile.py | 5 ++++- Misc/NEWS | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index ed800c577d..55cfaa9a8b 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -688,6 +688,16 @@ class OtherTests(unittest.TestCase): # quickly. self.assertRaises(IOError, zipfile.ZipFile, TESTFN) + def test_empty_file_raises_BadZipFile(self): + f = open(TESTFN, 'w') + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + + f = open(TESTFN, 'w') + f.write("short file") + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN) + def testClosedZipRaisesRuntimeError(self): # Verify that testzip() doesn't swallow inappropriate exceptions. data = io.BytesIO() diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 6357b94d2b..79ca1527f9 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 diff --git a/Misc/NEWS b/Misc/NEWS index d335bfd9d4..ec4fa86eec 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -61,6 +61,9 @@ Core and Builtins Library ------- +- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when + opening an empty or very small file. + - Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML Manifest file in text mode so string patterns can be used in regular expressions. -- 2.50.0