lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

html: Don't stop on unsupported encoding

Browse Source 
Continue to parse unlike in the XML case.
This commit is contained in:
Nick Wellnhofer
2025-06-06 03:29:57 +02:00
parent 416da89d0b
commit 70335c41fc
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HTMLparser.c
View File

@@ -3628,10 +3628,6 @@ htmlCharEncCheckAsciiCompatible(htmlParserCtxt *ctxt,
XML_ENC_INPUT | XML_ENC_HTML,
ctxt->convImpl, ctxt->convCtxt,
&handler);
/*
* TODO: Unlike the XML parser, we shouldn't raise a fatal
* if the encoding is unsupported.
*/
if (res != XML_ERR_OK) {
xmlFatalErr(ctxt, res, (const char *) encoding);
return(-1);
@@ -3711,10 +3707,6 @@ htmlCheckMeta(htmlParserCtxtPtr ctxt, const xmlChar **atts) {
return;
}
/*
* TODO: Unlike the XML parser, we shouldn't raise a fatal
* if the encoding is unsupported.
*/
xmlSetDeclaredEncoding(ctxt, encoding);
}
}

14
parserInternals.c
View File

@@ -468,14 +468,24 @@ void
xmlFatalErr(xmlParserCtxt *ctxt, xmlParserErrors code, const char *info)
{
const char *errmsg;
xmlErrorDomain domain = XML_FROM_PARSER;
xmlErrorLevel level = XML_ERR_FATAL;
errmsg = xmlErrString(code);
if ((ctxt != NULL) && (ctxt->html)) {
domain = XML_FROM_HTML;
/* Continue if encoding is unsupported */
if (code == XML_ERR_UNSUPPORTED_ENCODING)
level = XML_ERR_ERROR;
}
if (info == NULL) {
xmlCtxtErr(ctxt, NULL, XML_FROM_PARSER, code, XML_ERR_FATAL,
xmlCtxtErr(ctxt, NULL, domain, code, level,
NULL, NULL, NULL, 0, "%s\n", errmsg);
} else {
xmlCtxtErr(ctxt, NULL, XML_FROM_PARSER, code, XML_ERR_FATAL,
xmlCtxtErr(ctxt, NULL, domain, code, level,
(const xmlChar *) info, NULL, NULL, 0,
"%s: %s\n", errmsg, info);
}