From: R. David Murray <rdmurray@bitdance.com>
Date: Wed, 6 Jan 2010 20:08:02 +0000 (+0000)
Subject: Merged revisions 74245 via svnmerge from
X-Git-Tag: v2.6.5rc1~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=981130bf93b7576e9e7290cb0449b532b508e0c4;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 1fed79acae1c..a2c3a2c3fe00 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -664,6 +664,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 = StringIO()
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index e2ede459405d..34b3f1a77498 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
diff --git a/Misc/NEWS b/Misc/NEWS
index b1a1af13aeb7..af2c9dd19f8e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -318,6 +318,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
+  opening an empty or very small file.
+
 - Issue #1488943: difflib.Differ() doesn't always add hints for tab characters
 
 - Issue #5037: Proxy the __unicode__ special method instead to __unicode__