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: Always decode entities in namespace URIs

Browse Source 
Also decode entities in namespace URIs if entity substitution wasn't
requested. This should fix some corner cases when comparing namespace
URIs. The Namespaces in XML 1.0 spec says:

> In a namespace declaration, the URI reference is the normalized value
> of the attribute, so replacement of XML character and entity
> references has already been done before any comparison.

Make the serialization code escape special characters in namespace URIs
like in attribute values. This fixes serialization if entities were
substituted when parsing.

Fixes https://gitlab.gnome.org/GNOME/libxslt/-/issues/106
This commit is contained in:
Nick Wellnhofer 2024-04-15 11:27:44 +02:00
parent 971ce40409
commit f506ec6654
10 changed files with 134 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parser.c
View File

@ -4280,7 +4280,7 @@ xmlExpandEntitiesInAttValue(xmlParserCtxtPtr ctxt, const xmlChar *str,
*/ */
static xmlChar * static xmlChar *
xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *alloc, xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *alloc,
int normalize) { int normalize, int isNamespace) {
unsigned maxLength = (ctxt->options & XML_PARSE_HUGE) ? unsigned maxLength = (ctxt->options & XML_PARSE_HUGE) ?
XML_MAX_HUGE_LENGTH : XML_MAX_HUGE_LENGTH :
XML_MAX_TEXT_LENGTH; XML_MAX_TEXT_LENGTH;
@ -4288,6 +4288,10 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *alloc,
xmlChar *ret; xmlChar *ret;
int c, l, quote, flags, chunkSize; int c, l, quote, flags, chunkSize;
int inSpace = 1; int inSpace = 1;
int replaceEntities;
/* Always expand namespace URIs */
replaceEntities = (ctxt->replaceEntities) || (isNamespace);
xmlSBufInit(&buf, maxLength); xmlSBufInit(&buf, maxLength);
@ -4400,7 +4404,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *alloc,
if (val == 0) if (val == 0)
goto error; goto error;
if ((val == '&') && (!ctxt->replaceEntities)) { if ((val == '&') && (!replaceEntities)) {
/* /*
* The reparsing will be done in xmlStringGetNodeList() * The reparsing will be done in xmlStringGetNodeList()
* called by the attribute() function in SAX.c * called by the attribute() function in SAX.c
@ -4438,12 +4442,12 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *alloc,
continue; continue;
if (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY) { if (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY) {
if ((ent->content[0] == '&') && (!ctxt->replaceEntities)) if ((ent->content[0] == '&') && (!replaceEntities))
xmlSBufAddCString(&buf, "&", 5); xmlSBufAddCString(&buf, "&", 5);
else else
xmlSBufAddString(&buf, ent->content, ent->length); xmlSBufAddString(&buf, ent->content, ent->length);
inSpace = 0; inSpace = 0;
} else if (ctxt->replaceEntities) { } else if (replaceEntities) {
xmlExpandEntityInAttValue(ctxt, &buf, ent->content, ent, xmlExpandEntityInAttValue(ctxt, &buf, ent->content, ent,
normalize, &inSpace, ctxt->inputNr, normalize, &inSpace, ctxt->inputNr,
/* check */ 1); /* check */ 1);
@ -4544,7 +4548,7 @@ error:
xmlChar * xmlChar *
xmlParseAttValue(xmlParserCtxtPtr ctxt) { xmlParseAttValue(xmlParserCtxtPtr ctxt) {
if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL); if ((ctxt == NULL) || (ctxt->input == NULL)) return(NULL);
return(xmlParseAttValueInternal(ctxt, NULL, NULL, 0)); return(xmlParseAttValueInternal(ctxt, NULL, NULL, 0, 0));
} }
/** /**
@ -8777,6 +8781,7 @@ xmlParseAttribute2(xmlParserCtxtPtr ctxt,
const xmlChar *prefix, *name; const xmlChar *prefix, *name;
xmlChar *val = NULL, *internal_val = NULL; xmlChar *val = NULL, *internal_val = NULL;
int normalize = 0; int normalize = 0;
int isNamespace;
*value = NULL; *value = NULL;
GROW; GROW;
@ -8812,7 +8817,10 @@ xmlParseAttribute2(xmlParserCtxtPtr ctxt,
if (RAW == '=') { if (RAW == '=') {
NEXT; NEXT;
SKIP_BLANKS; SKIP_BLANKS;
val = xmlParseAttValueInternal(ctxt, len, alloc, normalize); isNamespace = (((prefix == NULL) && (name == ctxt->str_xmlns)) ||
(prefix == ctxt->str_xmlns));
val = xmlParseAttValueInternal(ctxt, len, alloc, normalize,
isNamespace);
if (val == NULL) if (val == NULL)
goto error; goto error;
} else { } else {

8
result/entity-in-ns-uri.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE doc [
<!ENTITY e "-">
]>
<doc>
<e xmlns="foo:x&amp;x&amp;x'x-x"/>
<e xmlns:ns="foo:x&amp;x&amp;x'x-x"/>
</doc>

11
result/entity-in-ns-uri.xml.rde Normal file
View File

@ -0,0 +1,11 @@
0 10 doc 0 0
0 1 doc 0 0
1 14 #text 0 1
1 1 e 1 0
1 14 #text 0 1
1 1 e 1 0
1 14 #text 0 1
0 15 doc 0 0

11
result/entity-in-ns-uri.xml.rdr Normal file
View File

@ -0,0 +1,11 @@
0 10 doc 0 0
0 1 doc 0 0
1 14 #text 0 1
1 1 e 1 0
1 14 #text 0 1
1 1 e 1 0
1 14 #text 0 1
0 15 doc 0 0

21
result/entity-in-ns-uri.xml.sax Normal file
View File

@ -0,0 +1,21 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(doc, , )
SAX.entityDecl(e, 1, (null), (null), -)
SAX.getEntity(e)
SAX.externalSubset(doc, , )
SAX.startElement(doc)
SAX.characters(
, 5)
SAX.getEntity(e)
SAX.startElement(e, xmlns='foo:x&#38;x&#38;x'x&e;x')
SAX.endElement(e)
SAX.characters(
, 5)
SAX.getEntity(e)
SAX.startElement(e, xmlns:ns='foo:x&#38;x&#38;x'x&e;x')
SAX.endElement(e)
SAX.characters(
, 1)
SAX.endElement(doc)
SAX.endDocument()

21
result/entity-in-ns-uri.xml.sax2 Normal file
View File

@ -0,0 +1,21 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(doc, , )
SAX.entityDecl(e, 1, (null), (null), -)
SAX.getEntity(e)
SAX.externalSubset(doc, , )
SAX.startElementNs(doc, NULL, NULL, 0, 0, 0)
SAX.characters(
, 5)
SAX.getEntity(e)
SAX.startElementNs(e, NULL, 'foo:x&x&x'x-x', 1, xmlns='foo:x&x&x'x-x', 0, 0)
SAX.endElementNs(e, NULL, 'foo:x&x&x'x-x')
SAX.characters(
, 5)
SAX.getEntity(e)
SAX.startElementNs(e, NULL, NULL, 1, xmlns:ns='foo:x&x&x'x-x', 0, 0)
SAX.endElementNs(e, NULL, NULL)
SAX.characters(
, 1)
SAX.endElementNs(doc, NULL, NULL)
SAX.endDocument()

8
result/noent/entity-in-ns-uri.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE doc [
<!ENTITY e "-">
]>
<doc>
<e xmlns="foo:x&amp;x&amp;x'x-x"/>
<e xmlns:ns="foo:x&amp;x&amp;x'x-x"/>
</doc>

21
result/noent/entity-in-ns-uri.xml.sax2 Normal file
View File

@ -0,0 +1,21 @@
SAX.setDocumentLocator()
SAX.startDocument()
SAX.internalSubset(doc, , )
SAX.entityDecl(e, 1, (null), (null), -)
SAX.getEntity(e)
SAX.externalSubset(doc, , )
SAX.startElementNs(doc, NULL, NULL, 0, 0, 0)
SAX.characters(
, 5)
SAX.getEntity(e)
SAX.startElementNs(e, NULL, 'foo:x&x&x'x-x', 1, xmlns='foo:x&x&x'x-x', 0, 0)
SAX.endElementNs(e, NULL, 'foo:x&x&x'x-x')
SAX.characters(
, 5)
SAX.getEntity(e)
SAX.startElementNs(e, NULL, NULL, 1, xmlns:ns='foo:x&x&x'x-x', 0, 0)
SAX.endElementNs(e, NULL, NULL)
SAX.characters(
, 1)
SAX.endElementNs(doc, NULL, NULL)
SAX.endDocument()

7
test/entity-in-ns-uri.xml Normal file
View File

@ -0,0 +1,7 @@
<!DOCTYPE doc [
<!ENTITY e "-">
]>
<doc>
<e xmlns="foo:x&#38;x&amp;x&apos;x&e;x"/>
<e xmlns:ns="foo:x&#38;x&amp;x&apos;x&e;x"/>
</doc>

35
xmlsave.c
View File

@ -870,7 +870,8 @@ xmlOutputBufferWriteWSNonSig(xmlSaveCtxtPtr ctxt, int extra)
* If @ctxt is supplied, @buf should be its buffer. * If @ctxt is supplied, @buf should be its buffer.
*/ */
static void static void
xmlNsDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur, xmlSaveCtxtPtr ctxt) { xmlNsDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlNsPtr cur,
xmlSaveCtxtPtr ctxt) {
if ((cur == NULL) || (buf == NULL)) return; if ((cur == NULL) || (buf == NULL)) return;
if ((cur->type == XML_LOCAL_NAMESPACE) && (cur->href != NULL)) { if ((cur->type == XML_LOCAL_NAMESPACE) && (cur->href != NULL)) {
if (xmlStrEqual(cur->prefix, BAD_CAST "xml")) if (xmlStrEqual(cur->prefix, BAD_CAST "xml"))
@ -887,24 +888,12 @@ xmlNsDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur, xmlSaveCtxtPtr ctxt) {
xmlOutputBufferWriteString(buf, (const char *)cur->prefix); xmlOutputBufferWriteString(buf, (const char *)cur->prefix);
} else } else
xmlOutputBufferWrite(buf, 5, "xmlns"); xmlOutputBufferWrite(buf, 5, "xmlns");
xmlOutputBufferWrite(buf, 1, "="); xmlOutputBufferWrite(buf, 2, "=\"");
xmlOutputBufferWriteQuotedString(buf, cur->href); xmlBufAttrSerializeTxtContent(buf, doc, cur->href);
xmlOutputBufferWrite(buf, 1, "\"");
} }
} }
/**
* xmlNsDumpOutputCtxt
* @ctxt: the save context
* @cur: a namespace
*
* Dump a local Namespace definition to a save context.
* Should be called in the context of attribute dumps.
*/
static void
xmlNsDumpOutputCtxt(xmlSaveCtxtPtr ctxt, xmlNsPtr cur) {
xmlNsDumpOutput(ctxt->buf, cur, ctxt);
}
/** /**
* xmlNsListDumpOutputCtxt * xmlNsListDumpOutputCtxt
* @ctxt: the save context * @ctxt: the save context
@ -914,9 +903,9 @@ xmlNsDumpOutputCtxt(xmlSaveCtxtPtr ctxt, xmlNsPtr cur) {
* Should be called in the context of attribute dumps. * Should be called in the context of attribute dumps.
*/ */
static void static void
xmlNsListDumpOutputCtxt(xmlSaveCtxtPtr ctxt, xmlNsPtr cur) { xmlNsListDumpOutputCtxt(xmlSaveCtxtPtr ctxt, xmlDocPtr doc, xmlNsPtr cur) {
while (cur != NULL) { while (cur != NULL) {
xmlNsDumpOutput(ctxt->buf, cur, ctxt); xmlNsDumpOutput(ctxt->buf, doc, cur, ctxt);
cur = cur->next; cur = cur->next;
} }
} }
@ -932,7 +921,7 @@ xmlNsListDumpOutputCtxt(xmlSaveCtxtPtr ctxt, xmlNsPtr cur) {
void void
xmlNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur) { xmlNsListDumpOutput(xmlOutputBufferPtr buf, xmlNsPtr cur) {
while (cur != NULL) { while (cur != NULL) {
xmlNsDumpOutput(buf, cur, NULL); xmlNsDumpOutput(buf, NULL, cur, NULL);
cur = cur->next; cur = cur->next;
} }
} }
@ -1168,7 +1157,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
} }
xmlOutputBufferWriteString(buf, (const char *)cur->name); xmlOutputBufferWriteString(buf, (const char *)cur->name);
if (cur->nsDef) if (cur->nsDef)
xmlNsListDumpOutputCtxt(ctxt, cur->nsDef); xmlNsListDumpOutputCtxt(ctxt, cur->doc, cur->nsDef);
for (attr = cur->properties; attr != NULL; attr = attr->next) for (attr = cur->properties; attr != NULL; attr = attr->next)
xmlAttrDumpOutput(ctxt, attr); xmlAttrDumpOutput(ctxt, attr);
@ -1308,7 +1297,7 @@ xmlNodeDumpOutputInternal(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
break; break;
case XML_NAMESPACE_DECL: case XML_NAMESPACE_DECL:
xmlNsDumpOutputCtxt(ctxt, (xmlNsPtr) cur); xmlNsDumpOutput(buf, NULL, (xmlNsPtr) cur, ctxt);
break; break;
default: default:
@ -1692,7 +1681,7 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
break; break;
case XML_NAMESPACE_DECL: case XML_NAMESPACE_DECL:
xmlNsDumpOutputCtxt(ctxt, (xmlNsPtr) cur); xmlNsDumpOutput(buf, NULL, (xmlNsPtr) cur, ctxt);
break; break;
case XML_DTD_NODE: case XML_DTD_NODE:
@ -1747,7 +1736,7 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
xmlOutputBufferWriteString(buf, (const char *)cur->name); xmlOutputBufferWriteString(buf, (const char *)cur->name);
if (cur->nsDef) if (cur->nsDef)
xmlNsListDumpOutputCtxt(ctxt, cur->nsDef); xmlNsListDumpOutputCtxt(ctxt, cur->doc, cur->nsDef);
if ((xmlStrEqual(cur->name, BAD_CAST "html") && if ((xmlStrEqual(cur->name, BAD_CAST "html") &&
(cur->ns == NULL) && (cur->nsDef == NULL))) { (cur->ns == NULL) && (cur->nsDef == NULL))) {
/* /*