From: Eli Bendersky <eliben@gmail.com>
Date: Thu, 28 Nov 2013 14:35:40 +0000 (-0800)
Subject: Issue #19815: Fix segfault when parsing empty namespace declaration.
X-Git-Tag: v3.4.0b2~444
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8148164353b935ce7a1716d82eca461e0ca6ed8f;p=thirdparty%2FPython%2Fcpython.git

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

Based on patches by Christian Heimes and Vajrasky Kok
---

8148164353b935ce7a1716d82eca461e0ca6ed8f
diff --cc Modules/_elementtree.c
index 46a1f4157cc7,f45893f15dd8..b3b69767086c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@@ -3035,10 -2997,10 +3035,13 @@@ expat_start_ns_handler(XMLParserObject
      PyObject* sprefix = NULL;
      PyObject* suri = NULL;
  
 +    if (PyErr_Occurred())
 +        return;
 +
-     suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict");
+     if (uri)
+         suri = PyUnicode_DecodeUTF8(uri, strlen(uri), "strict");
+     else
+         suri = PyUnicode_FromString("");
      if (!suri)
          return;