@@ -293,6 +293,36 @@ def test_read_return_size(self):

buf = fp.read(test_size)

self.assertEqual(len(buf), test_size)

def test_truncated_zipfile(self):

fp = io.BytesIO()

with zipfile.ZipFile(fp, mode='w') as zipf:

zipf.writestr('strfile', self.data, compress_type=self.compression)

end_offset = fp.tell()

zipfiledata = fp.getvalue()

fp = io.BytesIO(zipfiledata)

with zipfile.ZipFile(fp) as zipf:

with zipf.open('strfile') as zipopen:

fp.truncate(end_offset - 20)

with self.assertRaises(EOFError):

zipopen.read()

fp = io.BytesIO(zipfiledata)

with zipfile.ZipFile(fp) as zipf:

with zipf.open('strfile') as zipopen:

fp.truncate(end_offset - 20)

with self.assertRaises(EOFError):

while zipopen.read(100):

pass

fp = io.BytesIO(zipfiledata)

with zipfile.ZipFile(fp) as zipf:

with zipf.open('strfile') as zipopen:

fp.truncate(end_offset - 20)

with self.assertRaises(EOFError):

while zipopen.read1(100):

pass

def tearDown(self):

unlink(TESTFN)

unlink(TESTFN2)

@@ -389,6 +419,7 @@ def test_add_file_before_1980(self):

with zipfile.ZipFile(TESTFN2, "w") as zipfp:

self.assertRaises(ValueError, zipfp.write, TESTFN)

@requires_zlib

class DeflateTestsWithSourceFile(AbstractTestsWithSourceFile,

unittest.TestCase):

@@ -860,6 +860,8 @@ def _read2(self, n):

data = self._fileobj.read(n)

self._compress_left -= len(data)

if not data:

raise EOFError

if self._decrypter is not None:

data = bytes(map(self._decrypter, data))

@@ -36,6 +36,9 @@ Core and Builtins

Library

-------

- Issue #20078: Reading malformed zipfiles no longer hangs with 100% CPU

consumption.

- Issue #20113: os.readv() and os.writev() now raise an OSError exception on

error instead of returning -1.