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.
........

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index d4bb4d2c75bfd7b309243dea7d129becb80a50ec..b17f857778c0a0a96fedae67c12a7e46ad427e57 100644 (file)
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -701,6 +701,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 test_closed_zip_raises_RuntimeError(self):
         # Verify that testzip() doesn't swallow inappropriate exceptions.
         data = io.BytesIO()

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index de06d820bd6431ac031d367de0bb1d66ecc87375..0cfa37e88109fa5478e28e0edca8c3407f2cbcfe 100644 (file)
--- 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 aa4cfd906d02a9138ddc27026514d8a6e645505f..a60f3b23e1e5bba468d15796ac17db58db02f2eb 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -956,7 +956,10 @@ Core and Builtins
 Library
 -------
 
-- Issue #6545: Removed assert statements in distutils.Extension, so the 
+- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
+  opening an empty or very small file.
+
+- Issue #6545: Removed assert statements in distutils.Extension, so the
   behavior is similar when used with -O.
 
 - unittest has been split up into a package.  All old names should still work.