summaryrefslogtreecommitdiffstats
path: root/Modules/_elementtree.c
diff options
context:
space:
mode:
authorEli Bendersky <eliben@gmail.com>2013-11-28 14:35:40 (GMT)
committerEli Bendersky <eliben@gmail.com>2013-11-28 14:35:40 (GMT)
commit8148164353b935ce7a1716d82eca461e0ca6ed8f (patch)
tree5cf162b1aecf6bc508504e1c800866feff7d6fe5 /Modules/_elementtree.c
parent470fba1f9f3e3296df675fdd7d37102065cfb6ae (diff)
parent4b79518f83fa6c4dadd69326276032d74c8e3df7 (diff)
downloadcpython-8148164353b935ce7a1716d82eca461e0ca6ed8f.zip
cpython-8148164353b935ce7a1716d82eca461e0ca6ed8f.tar.gz
cpython-8148164353b935ce7a1716d82eca461e0ca6ed8f.tar.bz2
Issue #19815: Fix segfault when parsing empty namespace declaration.
Based on patches by Christian Heimes and Vajrasky Kok
Diffstat (limited to 'Modules/_elementtree.c')
-rw-r--r--Modules/_elementtree.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 46a1f41..b3b6976 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3038,7 +3038,10 @@ expat_start_ns_handler(XMLParserObject* self, const XML_Char* prefix,
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;