diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2022-11-16 16:31:05 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-12-14 02:23:37 +0000 |
| commit | 2e02df8552fcfb0facd2d1e324b227190a73a7bb (patch) | |
| tree | 3501dadfc8a8559645900663b74f481da07c113f | |
| parent | 596fa8888fd77d61c9730be16271821ff0515d0e (diff) | |
| download | expat-2e02df8552fcfb0facd2d1e324b227190a73a7bb.tar.gz | |
[CVE-2022-43680] Fix overeager DTD destruction (fixes #649)
Bug: http://b/255449293
Test: TreeHugger
Change-Id: I15ba529c07a6b868484bd5972be154c07cd97cc6
(cherry picked from commit 03836568ec3e5a4051e54bf39568656d07f5a3dd)
Merged-In: I15ba529c07a6b868484bd5972be154c07cd97cc6
| -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; } |