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.
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 @@
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)
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index f5c9ed4..ee68118 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1140,6 +1140,30 @@
class Bz2StreamWriteTest(StreamWriteTest):
mode = "w|bz2"
+class Bz2PartialReadTest(unittest.TestCase):
+ # Issue5068: The _BZ2Proxy.read() method loops forever
+ # on an empty or partial bzipped file.
+
+ def _test_partial_input(self, mode):
+ class MyStringIO(StringIO.StringIO):
+ hit_eof = False
+ def read(self, n):
+ if self.hit_eof:
+ raise AssertionError("infinite loop detected in tarfile.open()")
+ self.hit_eof = self.pos == self.len
+ return StringIO.StringIO.read(self, n)
+
+ data = bz2.compress(tarfile.TarInfo("foo").tobuf())
+ for x in range(len(data) + 1):
+ tarfile.open(fileobj=MyStringIO(data[:x]), mode=mode)
+
+ def test_partial_input(self):
+ self._test_partial_input("r")
+
+ def test_partial_input_bz2(self):
+ self._test_partial_input("r:bz2")
+
+
def test_main():
if not os.path.exists(TEMPDIR):
os.mkdir(TEMPDIR)
@@ -1196,6 +1220,7 @@
Bz2StreamReadTest,
Bz2WriteTest,
Bz2StreamWriteTest,
+ Bz2PartialReadTest,
]
try: