summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Gustäbel <lars@gustaebel.de>2015-07-02 17:38:38 (GMT)
committerLars Gustäbel <lars@gustaebel.de>2015-07-02 17:38:38 (GMT)
commitb7a688b3a40705ab4f7f7035d40ec026899c7052 (patch)
treec61e60f49ff4a846603bbe805b1fb73c70d9be13
parent3ef80587f01af27427fc1fcc05d8fd1726edd23d (diff)
downloadcpython-b7a688b3a40705ab4f7f7035d40ec026899c7052.zip
cpython-b7a688b3a40705ab4f7f7035d40ec026899c7052.tar.gz
cpython-b7a688b3a40705ab4f7f7035d40ec026899c7052.tar.bz2
Issue #24514: tarfile now tolerates number fields consisting of only whitespace.
-rwxr-xr-xLib/tarfile.py3
-rw-r--r--Lib/test/test_tarfile.py4
-rw-r--r--Misc/NEWS3
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index e3a2bb3..6d8d36c 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -178,7 +178,8 @@ def nti(s):
n = -(256 ** (len(s) - 1) - n)
else:
try:
- n = int(nts(s, "ascii", "strict") or "0", 8)
+ s = nts(s, "ascii", "strict")
+ n = int(s.strip() or "0", 8)
except ValueError:
raise InvalidHeaderError("invalid header")
return n
diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index c135304..5b55e07 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1842,6 +1842,10 @@ class MiscTest(unittest.TestCase):
self.assertEqual(tarfile.nti(b"\xff\x00\x00\x00\x00\x00\x00\x00"),
-0x100000000000000)
+ # Issue 24514: Test if empty number fields are converted to zero.
+ self.assertEqual(tarfile.nti(b"\0"), 0)
+ self.assertEqual(tarfile.nti(b" \0"), 0)
+
def test_write_number_fields(self):
self.assertEqual(tarfile.itn(1), b"0000001\x00")
self.assertEqual(tarfile.itn(0o7777777), b"7777777\x00")
diff --git a/Misc/NEWS b/Misc/NEWS
index 19451c4..1ed181d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,9 @@ Core and Builtins
Library
-------
+- Issue #24514: tarfile now tolerates number fields consisting of only
+ whitespace.
+
- Issue #19176: Fixed doctype() related bugs in C implementation of ElementTree.
A deprecation warning no longer issued by XMLParser subclass with default
doctype() method. Direct call of doctype() now issues a warning. Parser's