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

xmlreader: Fix xmlTextReaderConstEncoding

Browse Source 
Regression from commit f1c1f5c6.

Fixes #697.
This commit is contained in:
Nick Wellnhofer 2024-02-26 15:14:28 +01:00
parent 0b5650067b
commit 4365a5e115
4 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SAX2.c
View File

@ -955,17 +955,7 @@ xmlSAX2EndDocument(void *ctx)
doc = ctxt->myDoc; doc = ctxt->myDoc;
if ((doc != NULL) && (doc->encoding == NULL)) { if ((doc != NULL) && (doc->encoding == NULL)) {
const xmlChar *encoding = NULL; const xmlChar *encoding = xmlGetActualEncoding(ctxt);
if ((ctxt->input->flags & XML_INPUT_USES_ENC_DECL) ||
(ctxt->input->flags & XML_INPUT_AUTO_ENCODING)) {
/* Preserve encoding exactly */
encoding = ctxt->encoding;
} else if ((ctxt->input->buf) && (ctxt->input->buf->encoder)) {
encoding = BAD_CAST ctxt->input->buf->encoder->name;
} else if (ctxt->input->flags & XML_INPUT_HAS_ENCODING) {
encoding = BAD_CAST "UTF-8";
}
if (encoding != NULL) { if (encoding != NULL) {
doc->encoding = xmlStrdup(encoding); doc->encoding = xmlStrdup(encoding);

2
include/private/parser.h
View File

@ -48,6 +48,8 @@ XML_HIDDEN void
xmlDetectEncoding(xmlParserCtxtPtr ctxt); xmlDetectEncoding(xmlParserCtxtPtr ctxt);
XML_HIDDEN void XML_HIDDEN void
xmlSetDeclaredEncoding(xmlParserCtxtPtr ctxt, xmlChar *encoding); xmlSetDeclaredEncoding(xmlParserCtxtPtr ctxt, xmlChar *encoding);
XML_HIDDEN const xmlChar *
xmlGetActualEncoding(xmlParserCtxtPtr ctxt);
XML_HIDDEN xmlParserNsData * XML_HIDDEN xmlParserNsData *
xmlParserNsCreate(void); xmlParserNsCreate(void);

24
parserInternals.c
View File

@ -1479,6 +1479,30 @@ xmlSetDeclaredEncoding(xmlParserCtxtPtr ctxt, xmlChar *encoding) {
} }
} }
/**
* xmlGetActualEncoding:
* @ctxt: the parser context
*
* Returns the actual used to parse the document. This can differ from
* the declared encoding.
*/
const xmlChar *
xmlGetActualEncoding(xmlParserCtxtPtr ctxt) {
const xmlChar *encoding = NULL;
if ((ctxt->input->flags & XML_INPUT_USES_ENC_DECL) ||
(ctxt->input->flags & XML_INPUT_AUTO_ENCODING)) {
/* Preserve encoding exactly */
encoding = ctxt->encoding;
} else if ((ctxt->input->buf) && (ctxt->input->buf->encoder)) {
encoding = BAD_CAST ctxt->input->buf->encoder->name;
} else if (ctxt->input->flags & XML_INPUT_HAS_ENCODING) {
encoding = BAD_CAST "UTF-8";
}
return(encoding);
}
/************************************************************************ /************************************************************************
* * * *
* Commodity functions to handle entities processing * * Commodity functions to handle entities processing *

24
xmlreader.c
View File

@ -40,6 +40,7 @@
#endif #endif
#include "private/buf.h" #include "private/buf.h"
#include "private/parser.h"
#include "private/tree.h" #include "private/tree.h"
#ifdef LIBXML_XINCLUDE_ENABLED #ifdef LIBXML_XINCLUDE_ENABLED
#include "private/xinclude.h" #include "private/xinclude.h"
@ -2795,20 +2796,17 @@ xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader) {
*/ */
const xmlChar * const xmlChar *
xmlTextReaderConstEncoding(xmlTextReaderPtr reader) { xmlTextReaderConstEncoding(xmlTextReaderPtr reader) {
xmlDocPtr doc = NULL; const xmlChar *encoding = NULL;
if (reader == NULL)
return(NULL);
if (reader->doc != NULL)
doc = reader->doc;
else if (reader->ctxt != NULL)
doc = reader->ctxt->myDoc;
if (doc == NULL)
return(NULL);
if (doc->encoding == NULL) if (reader == NULL)
return(NULL); return(NULL);
else
return(CONSTSTR(doc->encoding)); if (reader->ctxt != NULL)
encoding = xmlGetActualEncoding(reader->ctxt);
else if (reader->doc != NULL)
encoding = reader->doc->encoding;
return(CONSTSTR(encoding));
} }