nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1797336 - Apply expat CVE-2022-43680 fix. r=mccr8

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D160676
This commit is contained in:
Peter Van der Beken 2022-10-30 19:12:03 +00:00
parent 858d7d5e44
commit 4d75a5523a
1 changed files with 8 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
parser/expat/lib/xmlparse.c
View file

@ -1009,6 +1009,14 @@ parserCreate(const XML_Char *encodingName,
parserInit(parser, encodingName); parserInit(parser, encodingName);
if (encodingName && !protocolEncodingName) { if (encodingName && !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); XML_ParserFree(parser);
return NULL; return NULL;
} }