Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3
* dev/11/fp3/security-aosp-rvc-release:
Fix overeager DTD destruction (fixes #649)
Change-Id: I208e4c75ede18dd0dd8a506d3332f1e4e4a3a822
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
index 06dcb32..c84b5ed 100644
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c
@@ -970,6 +970,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;
}