diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-06 23:59:42 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-06 23:59:42 +0000 |
| commit | 7771b5d77be9274590bbb5e30d756e6e42f3802a (patch) | |
| tree | 3501dadfc8a8559645900663b74f481da07c113f | |
| parent | 2ea50b3d016347e04b218d36820d7e842b2ca010 (diff) | |
| parent | 410c5f4d73806d462e26350d4a3c47498af77427 (diff) | |
| download | expat-android13-mainline-os-statsd-release.tar.gz | |
Snap for 9463210 from 410c5f4d73806d462e26350d4a3c47498af77427 to mainline-os-statsd-releaseaml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000android13-mainline-os-statsd-release
Change-Id: Ic82560fe8388142b08a1673240f9b8346a5476ef
| -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; } |