commit | 5ce3f10aeea711bb912e948fa5d9f63736df1327 | [log] [tgz] |
---|---|---|
author | Serhiy Storchaka <storchaka@gmail.com> | Thu Jan 09 14:50:20 2014 +0200 |
committer | Serhiy Storchaka <storchaka@gmail.com> | Thu Jan 09 14:50:20 2014 +0200 |
tree | 977da819c4d6e15bb355334b15b88b67d8f52c90 | |
parent | 78ee3289e991882d803be4cb0dd6b4005f82cbb1 [diff] [blame] |
Issue #20078: Reading malformed zipfiles no longer hangs with 100% CPU consumption.
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 92c98ab..a1b3414 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py
@@ -860,6 +860,8 @@ 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))