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

(cherry picked from commit 3185267) Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>

Author: miss-islington

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()))

Lib/test/test_plistlib.py

@@ -497,6 +497,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]
 

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