Mailing List Archive

https://github.com/python/cpython/commit/3185267400be853404f22a1e06bb9fe1210735c7
commit: 3185267400be853404f22a1e06bb9fe1210735c7
branch: master
author: Ronald Oussoren <ronaldoussoren@mac.com>
committer: GitHub <noreply@github.com>
date: 2020-10-20T09:26:33+02:00
summary:

bpo-41491: plistlib: accept hexadecimal integer values in xml plist files (GH-22764)

files:
A Misc/NEWS.d/next/Library/2020-10-19-14-02-09.bpo-41491.d1BUWH.rst
M Lib/plistlib.py
M Lib/test/test_plistlib.py

diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index ba7ac1936479f..a7403510a3216 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -252,7 +252,11 @@ def end_false(self):
self.add_object(False)

def end_integer(self):
- self.add_object(int(self.get_data()))
+ raw = self.get_data()
+ if raw.startswith('0x') or raw.startswith('0X'):
+ self.add_object(int(raw, 16))
+ else:
+ self.add_object(int(raw))

def end_real(self):
self.add_object(float(self.get_data()))
diff --git a/Lib/test/test_plistlib.py b/Lib/test/test_plistlib.py
index cb071da1f33a1..c9dce0047b79c 100644
--- a/Lib/test/test_plistlib.py
+++ b/Lib/test/test_plistlib.py
@@ -498,6 +498,19 @@ def test_invalidreal(self):
self.assertRaises(ValueError, plistlib.loads,
b"<plist><integer>not real</integer></plist>")

+ def test_integer_notations(self):
+ pl = b"<plist><integer>456</integer></plist>"
+ value = plistlib.loads(pl)
+ self.assertEqual(value, 456)
+
+ pl = b"<plist><integer>0xa</integer></plist>"
+ value = plistlib.loads(pl)
+ self.assertEqual(value, 10)
+
+ pl = b"<plist><integer>0123</integer></plist>"
+ value = plistlib.loads(pl)
+ self.assertEqual(value, 123)
+
def test_xml_encodings(self):
base = TESTDATA[plistlib.FMT_XML]

diff --git a/Misc/NEWS.d/next/Library/2020-10-19-14-02-09.bpo-41491.d1BUWH.rst b/Misc/NEWS.d/next/Library/2020-10-19-14-02-09.bpo-41491.d1BUWH.rst
new file mode 100644
index 0000000000000..4f39c91b284fa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-10-19-14-02-09.bpo-41491.d1BUWH.rst
@@ -0,0 +1 @@
+plistlib: fix parsing XML plists with hexadecimal integer values

_______________________________________________
Python-checkins mailing list
Python-checkins@python.org
https://mail.python.org/mailman/listinfo/python-checkins