commit e0834bf839d668bd39ae4fa94015e270ef1bd1b4
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 10 00:05:57 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jan 10 00:05:57 2023 +0000
tree 3501dadfc8a8559645900663b74f481da07c113f
parent a3e1016636b176ac083b0afcc894c2cfa76f8a7f
parent 1c23f39870dc2230af2cf1a8bdb4d8bb0ae977d4

Snap for 9470583 from 1c23f39870dc2230af2cf1a8bdb4d8bb0ae977d4 to tm-qpr3-release

Change-Id: I10f266772746dc384091b7cdcba12edf737c3f3d

lib/xmlparse.c

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;
   }