c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

parser: Fix EBCDIC detection

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-06-28 23:13:38 +02:00
parent 37a9ff11d8
commit 0b0dd98983
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
encoding.c
View File

@ -873,7 +873,8 @@ xmlLookupCharEncodingHandler(xmlCharEncoding enc,
return(XML_ERR_UNSUPPORTED_ENCODING); return(XML_ERR_UNSUPPORTED_ENCODING);
/* Return NULL handler for UTF-8 */ /* Return NULL handler for UTF-8 */
if (enc == XML_CHAR_ENCODING_UTF8) if ((enc == XML_CHAR_ENCODING_UTF8) ||
(enc == XML_CHAR_ENCODING_NONE))
return(XML_ERR_OK); return(XML_ERR_OK);
handler = &defaultHandlers[enc]; handler = &defaultHandlers[enc];

34
parserInternals.c
View File

@ -1205,24 +1205,9 @@ xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc)
if ((ctxt == NULL) || (ctxt->input == NULL)) if ((ctxt == NULL) || (ctxt->input == NULL))
return(-1); return(-1);
switch (enc) { res = xmlLookupCharEncodingHandler(enc, &handler);
case XML_CHAR_ENCODING_NONE:
case XML_CHAR_ENCODING_UTF8:
case XML_CHAR_ENCODING_ASCII:
res = 0;
break;
case XML_CHAR_ENCODING_EBCDIC:
res = xmlDetectEBCDIC(ctxt, &handler);
break;
default:
res = xmlLookupCharEncodingHandler(enc, &handler);
break;
}
if (res != 0) { if (res != 0) {
const char *name = xmlGetCharEncodingName(enc); xmlFatalErr(ctxt, res, NULL);
xmlFatalErr(ctxt, res, (name ? name : "<null>"));
return(-1); return(-1);
} }
@ -1512,7 +1497,20 @@ xmlDetectEncoding(xmlParserCtxtPtr ctxt) {
if (enc != XML_CHAR_ENCODING_NONE) { if (enc != XML_CHAR_ENCODING_NONE) {
ctxt->input->flags |= autoFlag; ctxt->input->flags |= autoFlag;
xmlSwitchEncoding(ctxt, enc);
if (enc == XML_CHAR_ENCODING_EBCDIC) {
xmlCharEncodingHandlerPtr handler;
int res;
res = xmlDetectEBCDIC(ctxt, &handler);
if (res != XML_ERR_OK) {
xmlFatalErr(ctxt, res, "detecting EBCDIC\n");
} else {
xmlSwitchInputEncoding(ctxt, ctxt->input, handler);
}
} else {
xmlSwitchEncoding(ctxt, enc);
}
} }
} }