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: Push general entity input streams on the stack

Browse Source 
This allows the error handler to give more context.
This commit is contained in:
Nick Wellnhofer 2023-12-27 00:44:16 +01:00
parent a5dcf0f422
commit 4ecc85d2cb
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
parser.c
View File

@ -12260,8 +12260,8 @@ xmlCtxtParseContent(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
int oldNameNr, oldSpaceNr, oldNodeNr;
int oldWellFormed;
int oldNodeLen, oldNodeMem;
xmlParserNsData *nsdb, *oldNsdb;
int ret;
xmlParserNsData *nsdb = NULL, *oldNsdb;
int ret = XML_ERR_NO_MEMORY;
if (list != NULL)
*list = NULL;
@ -12276,7 +12276,7 @@ xmlCtxtParseContent(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
root = xmlNewDocNode(ctxt->myDoc, NULL, BAD_CAST "pseudoroot", NULL);
if (root == NULL) {
xmlErrMemory(ctxt);
return(XML_ERR_NO_MEMORY);
goto error;
}
/*
@ -12286,8 +12286,12 @@ xmlCtxtParseContent(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
nsdb = xmlParserNsCreate();
if (nsdb == NULL) {
xmlErrMemory(ctxt);
xmlFreeNode(root);
return(XML_ERR_NO_MEMORY);
goto error;
}
if (xmlPushInput(ctxt, input) < 0) {
xmlErrMemory(ctxt);
goto error;
}
oldNode = ctxt->node;
@ -12301,12 +12305,6 @@ xmlCtxtParseContent(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
oldSpaceNr = ctxt->spaceNr;
oldNodeNr = ctxt->nodeNr;
/*
* TODO: It would be nice if we could simply push the input onto
* the input stack. But there's still some code that assumes that
* ctxt->inputNr > 1 means that we're inside a parameter entity.
*/
ctxt->input = input;
ctxt->nodelen = 0;
ctxt->nodemem = 0;
ctxt->nsdb = nsdb;
@ -12398,6 +12396,10 @@ xmlCtxtParseContent(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
ctxt->nodemem = oldNodeMem;
ctxt->nsdb = oldNsdb;
/* xmlPopInput would free the stream */
inputPop(ctxt);
error:
xmlParserNsFree(nsdb);
xmlFreeNode(root);

4
result/errors/ns-ent.xml.ent
View File

@ -1,3 +1,5 @@
namespace error : Namespace prefix ns on elem is not defined
./test/errors/ns-ent.xml:8: namespace error : Namespace prefix ns on elem is not defined
<a xmlns:ns="urn:a">&ent2;</a>
^
<ns:elem/>
^

4
result/errors/ns-ent.xml.err
View File

@ -1,3 +1,5 @@
namespace error : Namespace prefix ns on elem is not defined
./test/errors/ns-ent.xml:8: namespace error : Namespace prefix ns on elem is not defined
<a xmlns:ns="urn:a">&ent2;</a>
^
<ns:elem/>
^

4
result/errors/ns-ent.xml.str
View File

@ -1,3 +1,5 @@
namespace error : Namespace prefix ns on elem is not defined
./test/errors/ns-ent.xml:8: namespace error : Namespace prefix ns on elem is not defined
<a xmlns:ns="urn:a">&ent2;</a>
^
<ns:elem/>
^