Skip to content

Commit 3b1bc78

Browse files
Issue python#25019: Fixed a crash caused by setting non-string key of expat parser.
Added additional tests for expat parser attributes. Based on patch by John Leitch.
2 parents ae0d752 + 931331a commit 3b1bc78

4 files changed

Lines changed: 51 additions & 16 deletions

File tree

‎Lib/test/test_pyexpat.py‎

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,47 @@
1616
class SetAttributeTest(unittest.TestCase):
1717
def setUp(self):
1818
self.parser = expat.ParserCreate(namespace_separator='!')
19-
self.set_get_pairs = [
20-
[0, 0],
21-
[1, 1],
22-
[2, 1],
23-
[0, 0],
24-
]
19+
20+
def test_buffer_text(self):
21+
self.assertIs(self.parser.buffer_text, False)
22+
for x in 0, 1, 2, 0:
23+
self.parser.buffer_text = x
24+
self.assertIs(self.parser.buffer_text, bool(x))
25+
26+
def test_namespace_prefixes(self):
27+
self.assertIs(self.parser.namespace_prefixes, False)
28+
for x in 0, 1, 2, 0:
29+
self.parser.namespace_prefixes = x
30+
self.assertIs(self.parser.namespace_prefixes, bool(x))
2531

2632
def test_ordered_attributes(self):
27-
for x, y in self.set_get_pairs:
33+
self.assertIs(self.parser.ordered_attributes, False)
34+
for x in 0, 1, 2, 0:
2835
self.parser.ordered_attributes = x
29-
self.assertEqual(self.parser.ordered_attributes, y)
36+
self.assertIs(self.parser.ordered_attributes, bool(x))
37+
38+
def test_specified_attributes(self):
39+
self.assertIs(self.parser.specified_attributes, False)
40+
for x in 0, 1, 2, 0:
41+
self.parser.specified_attributes = x
42+
self.assertIs(self.parser.specified_attributes, bool(x))
3043

3144
def test_specified_attributes(self):
32-
for x, y in self.set_get_pairs:
45+
self.assertIs(self.parser.specified_attributes, False)
46+
for x in 0, 1, 2, 0:
3347
self.parser.specified_attributes = x
34-
self.assertEqual(self.parser.specified_attributes, y)
48+
self.assertIs(self.parser.specified_attributes, bool(x))
49+
50+
def test_invalid_attributes(self):
51+
with self.assertRaises(AttributeError):
52+
self.parser.returns_unicode = 1
53+
with self.assertRaises(AttributeError):
54+
self.parser.returns_unicode
55+
56+
# Issue #25019
57+
self.assertRaises(TypeError, setattr, self.parser, range(0xF), 0)
58+
self.assertRaises(TypeError, self.parser.__setattr__, range(0xF), 0)
59+
self.assertRaises(TypeError, getattr, self.parser, range(0xF))
3560

3661

3762
data = b'''\
@@ -514,11 +539,12 @@ def test_1000_bytes(self):
514539
def test_wrong_size(self):
515540
parser = expat.ParserCreate()
516541
parser.buffer_text = 1
517-
def f(size):
518-
parser.buffer_size = size
519-
520-
self.assertRaises(ValueError, f, -1)
521-
self.assertRaises(ValueError, f, 0)
542+
with self.assertRaises(ValueError):
543+
parser.buffer_size = -1
544+
with self.assertRaises(ValueError):
545+
parser.buffer_size = 0
546+
with self.assertRaises(TypeError):
547+
parser.buffer_size = 512.0
522548

523549
def test_unchanged_size(self):
524550
xml1 = b"<?xml version='1.0' encoding='iso8859'?><s>" + b'a' * 512

‎Misc/ACKS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@ Joerg Lehmann
831831
Robert Lehmann
832832
Petri Lehtinen
833833
Luke Kenneth Casson Leighton
834+
John Leitch
834835
Tshepang Lekhonkhobe
835836
Marc-André Lemburg
836837
Mateusz Lenik

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ Core and Builtins
1414
Library
1515
-------
1616

17+
- Issue #25019: Fixed a crash caused by setting non-string key of expat parser.
18+
Based on patch by John Leitch.
19+
1720
- Issue #16180: Exit pdb if file has syntax error, instead of trapping user
1821
in an infinite loop. Patch by Xavier de Gaye.
1922

‎Modules/pyexpat.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,11 +1378,16 @@ static int
13781378
xmlparse_setattro(xmlparseobject *self, PyObject *name, PyObject *v)
13791379
{
13801380
/* Set attribute 'name' to value 'v'. v==NULL means delete */
1381+
if (!PyUnicode_Check(name)) {
1382+
PyErr_Format(PyExc_TypeError,
1383+
"attribute name must be string, not '%.200s'",
1384+
name->ob_type->tp_name);
1385+
return -1;
1386+
}
13811387
if (v == NULL) {
13821388
PyErr_SetString(PyExc_RuntimeError, "Cannot delete attribute");
13831389
return -1;
13841390
}
1385-
assert(PyUnicode_Check(name));
13861391
if (PyUnicode_CompareWithASCIIString(name, "buffer_text") == 0) {
13871392
int b = PyObject_IsTrue(v);
13881393
if (b < 0)

0 commit comments

Comments
 (0)