Merge 1d0cf8914d8dedcec856b4bae19f32cb80fd4ced on remote branch
Change-Id: Ic49cc4e4ee2d1dc69fcb7ee673e9a71d3c405257
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
index 7db28d0..7e98191 100644
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c
@@ -1066,6 +1066,14 @@
parserInit(parser, encodingName);
if (encodingName && ! parser->m_protocolEncodingName) {
+ if (dtd) {
+ // We need to stop the upcoming call to XML_ParserFree from happily
+ // destroying parser->m_dtd because the DTD is shared with the parent
+ // parser and the only guard that keeps XML_ParserFree from destroying
+ // parser->m_dtd is parser->m_isParamEntity but it will be set to
+ // XML_TRUE only later in XML_ExternalEntityParserCreate (or not at all).
+ parser->m_dtd = NULL;
+ }
XML_ParserFree(parser);
return NULL;
}