diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-08 04:03:43 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-08 04:03:43 +0000 |
commit | 33c2f0a389a9f43f279dd9d490d99794dce7fdc2 (patch) | |
tree | b3732c1c5d6c0f72d78df2d68d37ad37a7fa0d90 | |
parent | 0305a41b4de3c8c98e173315c0804fc74cb3e2ba (diff) | |
parent | 1c67edf168725bc3be8a84336636533932a98c92 (diff) | |
download | expat-33c2f0a389a9f43f279dd9d490d99794dce7fdc2.tar.gz |
Merge cherrypicks of ['ag/20497949'] into security-aosp-rvc-release.android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android11-security-release
Change-Id: I2d99ce0c287f8d011a349b34b529d1f327b88c5c
-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; } |