From: Lars Gustäbel <lars@gustaebel.de>
Date: Thu, 2 Jul 2015 17:37:08 +0000 (+0200)
Subject: Issue #24514: tarfile now tolerates number fields consisting of only whitespace.
X-Git-Tag: v2.7.11rc1~255^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d048003d909360faf716c84459ed7067bdee5f08;p=thirdparty%2FPython%2Fcpython.git

Issue #24514: tarfile now tolerates number fields consisting of only whitespace.
---

diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 082f36117902..d7c1500bc572 100644
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -186,7 +186,7 @@ def nti(s):
     # itn() below.
     if s[0] != chr(0200):
         try:
-            n = int(nts(s) or "0", 8)
+            n = int(nts(s).strip() or "0", 8)
         except ValueError:
             raise InvalidHeaderError("invalid header")
     else:
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index ff3265fc0ee3..a92d371c7173 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1566,6 +1566,14 @@ class LimitsTest(unittest.TestCase):
         tarinfo.tobuf(tarfile.PAX_FORMAT)
 
 
+class MiscTest(unittest.TestCase):
+
+    def test_read_number_fields(self):
+        # Issue 24514: Test if empty number fields are converted to zero.
+        self.assertEqual(tarfile.nti("\0"), 0)
+        self.assertEqual(tarfile.nti("       \0"), 0)
+
+
 class ContextManagerTest(unittest.TestCase):
 
     def test_basic(self):
@@ -1730,6 +1738,7 @@ def test_main():
         PaxUnicodeTest,
         AppendTest,
         LimitsTest,
+        MiscTest,
         ContextManagerTest,
     ]
 
diff --git a/Misc/NEWS b/Misc/NEWS
index e6240e2b7adf..e46b701c11e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #24514: tarfile now tolerates number fields consisting of only
+  whitespace.
+
 - Issue #20387: Restore semantic round-trip correctness in tokenize/untokenize
   for tab-indented blocks.