Skip to content

Commit f50bf13

Browse files
gh-151981: Make tarfile._Stream.seek break at EOF (GH-151982)
Co-authored-by: Stan Ulbrych <stan@python.org>
1 parent 7915c4a commit f50bf13

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
@@ -546,7 +546,9 @@ def seek(self, pos=0):
546546
if pos - self.pos >= 0:
547547
blocks, remainder = divmod(pos - self.pos, self.bufsize)
548548
for i in range(blocks):
549-
self.read(self.bufsize)
549+
data = self.read(self.bufsize)
550+
if not data:
551+
break
550552
self.read(remainder)
551553
else:
552554
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
@@ -4878,6 +4878,22 @@ def valueerror_filter(tarinfo, path):
48784878
with self.check_context(arc.open(errorlevel='boo!'), filtererror_filter):
48794879
self.expect_exception(TypeError) # errorlevel is not int
48804880

4881+
@support.subTests('format', [tarfile.GNU_FORMAT, tarfile.PAX_FORMAT])
4882+
def test_getmembers_big_size(self, format):
4883+
# gh-151981: A loop in seek() for streaming files tried to read the
4884+
# declared number of blocks even at EOF
4885+
tinfo = tarfile.TarInfo("huge-file")
4886+
tinfo.size = 1 << 64
4887+
bio = io.BytesIO()
4888+
# Write header without data
4889+
bio.write(tinfo.tobuf(format))
4890+
4891+
# Reset & try to get contents
4892+
bio.seek(0)
4893+
with tarfile.open(fileobj=bio, mode="r|") as tar:
4894+
with self.assertRaises(tarfile.ReadError):
4895+
tar.getmembers()
4896+
48814897

48824898
class OverwriteTests(archiver_tests.OverwriteTests, unittest.TestCase):
48834899
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)