diff options
| author | Lars Gustäbel <lars@gustaebel.de> | 2009-03-22 20:09:33 (GMT) |
|---|---|---|
| committer | Lars Gustäbel <lars@gustaebel.de> | 2009-03-22 20:09:33 (GMT) |
| commit | 2020a59563caeda95023307a4c830fe03c338990 (patch) | |
| tree | dbd8152d0b445bbebd60a48eecaadf0fdc687a37 /Lib/tarfile.py | |
| parent | b364bfe2f406a99a83fc5b1073726ecbaa63f50f (diff) | |
| download | cpython-2020a59563caeda95023307a4c830fe03c338990.zip cpython-2020a59563caeda95023307a4c830fe03c338990.tar.gz cpython-2020a59563caeda95023307a4c830fe03c338990.tar.bz2 | |
Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop
forever on incomplete input. That caused tarfile.open() to hang when used
with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or
partial bzip2 compressed data.
Diffstat (limited to 'Lib/tarfile.py')
| -rw-r--r-- | Lib/tarfile.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py index 9191a82..1861664 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -662,12 +662,11 @@ class _BZ2Proxy(object): b = [self.buf] x = len(self.buf) while x < size: - try: - raw = self.fileobj.read(self.blocksize) - data = self.bz2obj.decompress(raw) - b.append(data) - except EOFError: + raw = self.fileobj.read(self.blocksize) + if not raw: break + data = self.bz2obj.decompress(raw) + b.append(data) x += len(data) self.buf = "".join(b) |