diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-09 21:27:41 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-09 21:27:41 +0000 |
commit | 0048d53cfc00916d0065362da6b35f71dbfa824e (patch) | |
tree | b3732c1c5d6c0f72d78df2d68d37ad37a7fa0d90 | |
parent | 62370d7ed12ce9435998421b137e689b3801dbaa (diff) | |
parent | 4d49eed34ea4cce7a13c8a434354834c487db897 (diff) | |
download | expat-android-platform-11.0.0_r29.tar.gz |
Merge cherrypicks of ['ag/20497950'] into rvc-platform-release.android-platform-11.0.0_r40android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android11-platform-release
Change-Id: I2e1b405d94c4cbb2bf49f2ce0576a47d6b52c45a
-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 06dcb32a..c84b5ede 100644 --- a/lib/xmlparse.c +++ b/lib/xmlparse.c @@ -970,6 +970,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; } |