diff options
| author | Eli Bendersky <eliben@gmail.com> | 2013-11-28 14:31:58 (GMT) |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2013-11-28 14:31:58 (GMT) |
| commit | 5dd40e555b625c592b8391df84b36215204db4df (patch) | |
| tree | 116f05746ecab2ff93071539ba8b926b682410c2 | |
| parent | c303cfdb8a1e23faf677262d7bc14c6ef6b2251a (diff) | |
| download | cpython-5dd40e555b625c592b8391df84b36215204db4df.zip cpython-5dd40e555b625c592b8391df84b36215204db4df.tar.gz cpython-5dd40e555b625c592b8391df84b36215204db4df.tar.bz2 | |
Issue #19815: Fix segfault when parsing empty namespace declaration.
Based on patches by Christian Heimes and Vajrasky Kok
| -rw-r--r-- | Lib/test/test_xml_etree.py | 5 | ||||
| -rw-r--r-- | Modules/_elementtree.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 5496534..7bd8a2c 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -535,6 +535,11 @@ class ElementTreeTest(unittest.TestCase): ('end-ns', None), ]) + events = ('start-ns', 'end-ns') + context = iterparse(io.StringIO(r"<root xmlns=''/>"), events) + res = [action for action, elem in context] + self.assertEqual(res, ['start-ns', 'end-ns']) + events = ("start", "end", "bogus") with self.assertRaises(ValueError) as cm: with open(SIMPLE_XMLFILE, "rb") as f: diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 9bdc4c7..7e01352 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -2997,7 +2997,10 @@ expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix, PyObject* sprefix = NULL; PyObject* suri = NULL; - suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + if (uri) + suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict"); + else + suri = PyUnicode_FromString(""); if (!suri) return; |