diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-28 19:20:40 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-28 19:20:40 +0000 |
commit | 7cf718acdb93dc854ffc33566f955dc50e410055 (patch) | |
tree | 3501dadfc8a8559645900663b74f481da07c113f | |
parent | 37c4336f955ae79ff48c6d8d9e37b5d0542bf412 (diff) | |
parent | 410c5f4d73806d462e26350d4a3c47498af77427 (diff) | |
download | expat-android13-mainline-permission-release.tar.gz |
Snap for 9441970 from 410c5f4d73806d462e26350d4a3c47498af77427 to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020android13-mainline-permission-release
Change-Id: I4a6c5370776365f96778f2c5a32e796a69d45550
-rw-r--r-- | lib/xmlparse.c | 8 |
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; } |