Snap for 9678129 from 410c5f4d73806d462e26350d4a3c47498af77427 to mainline-ipsec-release

Change-Id: I48d199ad5c86bea87613f52bb3722f08ba88831b

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/xmlparse.c b/lib/xmlparse.c
index 7db28d07..7e981919 100644
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c
@@ -1066,6 +1066,14 @@ parserCreate(const XML_Char *encodingName,
   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;
   }