Skip to content

Commit 4ce6bf7

Browse files
miss-islingtonencukouStanFromIreland
authored
[3.15] gh-151981: Make tarfile._Stream.seek break at EOF (GH-151982) (#151991)
(cherry picked from commit f50bf13) Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Stan Ulbrych <stan@python.org>
1 parent 660d792 commit 4ce6bf7

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

Lib/tarfile.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,9 @@ def seek(self, pos=0):
520520
if pos - self.pos >= 0:
521521
blocks, remainder = divmod(pos - self.pos, self.bufsize)
522522
for i in range(blocks):
523-
self.read(self.bufsize)
523+
data = self.read(self.bufsize)
524+
if not data:
525+
break
524526
self.read(remainder)
525527
else:
526528
raise StreamError("seeking backwards is not allowed")

Lib/test/test_tarfile.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4802,6 +4802,22 @@ def valueerror_filter(tarinfo, path):
48024802
with self.check_context(arc.open(errorlevel='boo!'), filtererror_filter):
48034803
self.expect_exception(TypeError) # errorlevel is not int
48044804

4805+
@support.subTests('format', [tarfile.GNU_FORMAT, tarfile.PAX_FORMAT])
4806+
def test_getmembers_big_size(self, format):
4807+
# gh-151981: A loop in seek() for streaming files tried to read the
4808+
# declared number of blocks even at EOF
4809+
tinfo = tarfile.TarInfo("huge-file")
4810+
tinfo.size = 1 << 64
4811+
bio = io.BytesIO()
4812+
# Write header without data
4813+
bio.write(tinfo.tobuf(format))
4814+
4815+
# Reset & try to get contents
4816+
bio.seek(0)
4817+
with tarfile.open(fileobj=bio, mode="r|") as tar:
4818+
with self.assertRaises(tarfile.ReadError):
4819+
tar.getmembers()
4820+
48054821

48064822
class OverwriteTests(archiver_tests.OverwriteTests, unittest.TestCase):
48074823
testdir = os.path.join(TEMPDIR, "testoverwrite")
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
In :mod:`tarfile`, seeking a stream now stops when end of the stream is
2+
reached.

0 commit comments

Comments
 (0)