diff options
| author |   Ronald Oussoren <ronaldoussoren@mac.com> | 2020-10-20 09:26:33 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2020-10-20 09:26:33 +0200 |
| commit | 3185267400be853404f22a1e06bb9fe1210735c7 (patch) | |
| tree | c3f3df6b68c8c2e54a83b05af2fb41efaa81fa94 | |
| parent | bpo-42093: Add opcode cache for LOAD_ATTR (GH-22803) (diff) | |
| download | cpython-3185267400be853404f22a1e06bb9fe1210735c7.tar.gz cpython-3185267400be853404f22a1e06bb9fe1210735c7.tar.bz2 cpython-3185267400be853404f22a1e06bb9fe1210735c7.zip | |
bpo-41491: plistlib: accept hexadecimal integer values in xml plist files (GH-22764)
| -rw-r--r-- | Lib/plistlib.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_plistlib.py | 13 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-10-19-14-02-09.bpo-41491.d1BUWH.rst | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/Lib/plistlib.py b/Lib/plistlib.py index ba7ac193647..a7403510a32 100644 --- a/Lib/plistlib.py +++ b/Lib/plistlib.py @@ -252,7 +252,11 @@ class _PlistParser: 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 cb071da1f33..c9dce0047b7 100644 --- a/Lib/test/test_plistlib.py +++ b/Lib/test/test_plistlib.py @@ -498,6 +498,19 @@ class TestPlistlib(unittest.TestCase): 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 00000000000..4f39c91b284 --- /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 |