Skip to content

Commit 5a8d121

Browse files
authored
bpo-39017: Avoid infinite loop in the tarfile module (GH-21454)
Avoid infinite loop when reading specially crafted TAR files using the tarfile module (CVE-2019-20907).
1 parent bbceef6 commit 5a8d121

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

Lib/tarfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,8 @@ def _proc_pax(self, tarfile):
12491249

12501250
length, keyword = match.groups()
12511251
length = int(length)
1252+
if length == 0:
1253+
raise InvalidHeaderError("invalid header")
12521254
value = buf[match.end(2) + 1:match.start(1) + length - 1]
12531255

12541256
# Normally, we could just use "utf-8" as the encoding and "strict"

Lib/test/recursion.tar

516 Bytes
Binary file not shown.

Lib/test/test_tarfile.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,13 @@ def test_premature_end_of_archive(self):
429429
with self.assertRaisesRegex(tarfile.ReadError, "unexpected end of data"):
430430
tar.extractfile(t).read()
431431

432+
def test_length_zero_header(self):
433+
# bpo-39017 (CVE-2019-20907): reading a zero-length header should fail
434+
# with an exception
435+
with self.assertRaisesRegex(tarfile.ReadError, "file could not be opened successfully"):
436+
with tarfile.open(support.findfile('recursion.tar')) as tar:
437+
pass
438+
432439
class MiscReadTestBase(CommonReadTest):
433440
def requires_name_attribute(self):
434441
pass
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Avoid infinite loop when reading specially crafted TAR files using the tarfile module (CVE-2019-20907).

0 commit comments

Comments
 (0)