commit d4eed30ccba325359204e5a2152a1d88a3541de7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:10:46 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:10:46 2023 +0000
tree 3501dadfc8a8559645900663b74f481da07c113f
parent fdaad93e5e7a46031af10d0a7d191c73f25c0def
parent 410c5f4d73806d462e26350d4a3c47498af77427

Snap for 10102166 from 410c5f4d73806d462e26350d4a3c47498af77427 to mainline-tzdata4-release

Change-Id: Ia096fa065812ead39ae76662d9b9a05cbd1415e4

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