From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 6 Jan 2010 20:12:07 +0000 (+0000)
Subject: Merged revisions 74246 via svnmerge from
X-Git-Tag: v3.1.2rc1~187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93a59653a49d60abaeb69a966370b4277e0f1d3a;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index ed800c577dd1..55cfaa9a8bca 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 6357b94d2b6d..79ca1527f99e 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 d335bfd9d4bc..ec4fa86eece3 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.