Issue #19815: Fix segfault when parsing empty namespace declaration.

Based on patches by Christian Heimes and Vajrasky Kok

Issue #19815: Fix segfault when parsing empty namespace declaration.
Based on patches by Christian Heimes and Vajrasky Kok
f933e081 · Eli Bendersky · cf6a3e2a · f933e081 · f933e081
Kaydet (Commit) f933e081 authored Kas 28, 2013 tarafından Eli Bendersky
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 3 deletions

test_xml_etree.py Lib/test/test_xml_etree.py +9 -2

_elementtree.c Modules/_elementtree.c +4 -1

No files found.
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -713,14 +713,21 @@ def iterparse():
    end {namespace}root
    end-ns None

+    >>> import StringIO
+
+    >>> events = ('start-ns', 'end-ns')
+    >>> context = ET.iterparse(StringIO.StringIO(r"<root xmlns=''/>"), events)
+    >>> for action, elem in context:
+    ...   print action, elem
+    start-ns ('', '')
+    end-ns None
+
    >>> events = ("start", "end", "bogus")
    >>> with open(SIMPLE_XMLFILE, "rb") as f:
    ...     iterparse(f, events)
    Traceback (most recent call last):
    ValueError: unknown event 'bogus'

-    >>> import StringIO
-
    >>> source = StringIO.StringIO(
    ...     "<?xml version='1.0' encoding='iso-8859-1'?>\\n"
    ...     "<body xmlns='http://&#233;ffbot.org/ns'\\n"

--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -2338,7 +2338,10 @@ expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix,
    PyObject* sprefix = NULL;
    PyObject* suri = NULL;

-    suri = makestring(uri, strlen(uri));
+    if (uri)
+      suri = makestring(uri, strlen(uri));
+    else
+      suri = PyString_FromStringAndSize("", 0);
    if (!suri)
        return;