From bde4372aa1f39803f5c33f1415e88b000d403d00 Mon Sep 17 00:00:00 2001
From: Rishi <rishi_devan@mail.com>
Date: Wed, 15 Jul 2020 13:51:00 +0200
Subject: [3.5] 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).
(cherry picked from commit 5a8d121a1f3ef5ad7c105ee378cc79a3eac0c7d4)

Co-authored-by: Rishi <rishi_devan@mail.com>
---
 Lib/tarfile.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Lib/tarfile.py')

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 999a99b978..8015fae7a6 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -1221,6 +1221,8 @@ class TarInfo(object):
 
             length, keyword = match.groups()
             length = int(length)
+            if length == 0:
+                raise InvalidHeaderError("invalid header")
             value = buf[match.end(2) + 1:match.start(1) + length - 1]
 
             # Normally, we could just use "utf-8" as the encoding and "strict"
-- 
cgit v1.2.1