mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-03-13 20:58:16 +03:00
Merge code paths loading external entities
Merge xmlParseCtxtExternalEntity into xmlParseExternalEntityPrivate.
This commit is contained in:
Nick Wellnhofer
parent
5c7e0a9a46
commit
1a3e584a5a
282
parser.c
282
parser.c
@ -12891,189 +12891,21 @@ xmlParseDTD(const xmlChar *ExternalID, const xmlChar *SystemID) {
|
||||
int
|
||||
xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
|
||||
const xmlChar *ID, xmlNodePtr *lst) {
|
||||
xmlParserCtxtPtr ctxt;
|
||||
xmlDocPtr newDoc;
|
||||
xmlNodePtr newRoot;
|
||||
xmlSAXHandlerPtr oldsax = NULL;
|
||||
int ret = 0;
|
||||
xmlChar start[4];
|
||||
xmlCharEncoding enc;
|
||||
void *userData;
|
||||
|
||||
if (ctx == NULL) return(-1);
|
||||
|
||||
if (((ctx->depth > 40) && ((ctx->options & XML_PARSE_HUGE) == 0)) ||
|
||||
(ctx->depth > 1024)) {
|
||||
return(XML_ERR_ENTITY_LOOP);
|
||||
}
|
||||
|
||||
if (lst != NULL)
|
||||
*lst = NULL;
|
||||
if ((URL == NULL) && (ID == NULL))
|
||||
return(-1);
|
||||
if (ctx->myDoc == NULL) /* @@ relax but check for dereferences */
|
||||
return(-1);
|
||||
|
||||
ctxt = xmlCreateEntityParserCtxtInternal(URL, ID, NULL, ctx);
|
||||
if (ctxt == NULL) {
|
||||
return(-1);
|
||||
}
|
||||
|
||||
oldsax = ctxt->sax;
|
||||
ctxt->sax = ctx->sax;
|
||||
xmlDetectSAX2(ctxt);
|
||||
newDoc = xmlNewDoc(BAD_CAST "1.0");
|
||||
if (newDoc == NULL) {
|
||||
xmlFreeParserCtxt(ctxt);
|
||||
return(-1);
|
||||
}
|
||||
newDoc->properties = XML_DOC_INTERNAL;
|
||||
if (ctx->myDoc->dict) {
|
||||
newDoc->dict = ctx->myDoc->dict;
|
||||
xmlDictReference(newDoc->dict);
|
||||
}
|
||||
if (ctx->myDoc != NULL) {
|
||||
newDoc->intSubset = ctx->myDoc->intSubset;
|
||||
newDoc->extSubset = ctx->myDoc->extSubset;
|
||||
}
|
||||
if (ctx->myDoc->URL != NULL) {
|
||||
newDoc->URL = xmlStrdup(ctx->myDoc->URL);
|
||||
}
|
||||
newRoot = xmlNewDocNode(newDoc, NULL, BAD_CAST "pseudoroot", NULL);
|
||||
if (newRoot == NULL) {
|
||||
ctxt->sax = oldsax;
|
||||
xmlFreeParserCtxt(ctxt);
|
||||
newDoc->intSubset = NULL;
|
||||
newDoc->extSubset = NULL;
|
||||
xmlFreeDoc(newDoc);
|
||||
return(-1);
|
||||
}
|
||||
xmlAddChild((xmlNodePtr) newDoc, newRoot);
|
||||
nodePush(ctxt, newDoc->children);
|
||||
if (ctx->myDoc == NULL) {
|
||||
ctxt->myDoc = newDoc;
|
||||
} else {
|
||||
ctxt->myDoc = ctx->myDoc;
|
||||
newDoc->children->doc = ctx->myDoc;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the 4 first bytes and decode the charset
|
||||
* if enc != XML_CHAR_ENCODING_NONE
|
||||
* plug some encoding conversion routines.
|
||||
*/
|
||||
GROW
|
||||
if ((ctxt->input->end - ctxt->input->cur) >= 4) {
|
||||
start[0] = RAW;
|
||||
start[1] = NXT(1);
|
||||
start[2] = NXT(2);
|
||||
start[3] = NXT(3);
|
||||
enc = xmlDetectCharEncoding(start, 4);
|
||||
if (enc != XML_CHAR_ENCODING_NONE) {
|
||||
xmlSwitchEncoding(ctxt, enc);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse a possible text declaration first
|
||||
*/
|
||||
if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
|
||||
xmlParseTextDecl(ctxt);
|
||||
/*
|
||||
* An XML-1.0 document can't reference an entity not XML-1.0
|
||||
*/
|
||||
if ((xmlStrEqual(ctx->version, BAD_CAST "1.0")) &&
|
||||
(!xmlStrEqual(ctxt->input->version, BAD_CAST "1.0"))) {
|
||||
xmlFatalErrMsg(ctxt, XML_ERR_VERSION_MISMATCH,
|
||||
"Version mismatch between document and entity\n");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* If the user provided its own SAX callbacks then reuse the
|
||||
* useData callback field, otherwise the expected setup in a
|
||||
* If the user provided their own SAX callbacks, then reuse the
|
||||
* userData callback field, otherwise the expected setup in a
|
||||
* DOM builder is to have userData == ctxt
|
||||
*/
|
||||
if (ctx->userData == ctx)
|
||||
ctxt->userData = ctxt;
|
||||
userData = NULL;
|
||||
else
|
||||
ctxt->userData = ctx->userData;
|
||||
|
||||
/*
|
||||
* Doing validity checking on chunk doesn't make sense
|
||||
*/
|
||||
ctxt->instate = XML_PARSER_CONTENT;
|
||||
ctxt->validate = ctx->validate;
|
||||
ctxt->valid = ctx->valid;
|
||||
ctxt->loadsubset = ctx->loadsubset;
|
||||
ctxt->depth = ctx->depth + 1;
|
||||
ctxt->replaceEntities = ctx->replaceEntities;
|
||||
if (ctxt->validate) {
|
||||
ctxt->vctxt.error = ctx->vctxt.error;
|
||||
ctxt->vctxt.warning = ctx->vctxt.warning;
|
||||
} else {
|
||||
ctxt->vctxt.error = NULL;
|
||||
ctxt->vctxt.warning = NULL;
|
||||
}
|
||||
ctxt->vctxt.nodeTab = NULL;
|
||||
ctxt->vctxt.nodeNr = 0;
|
||||
ctxt->vctxt.nodeMax = 0;
|
||||
ctxt->vctxt.node = NULL;
|
||||
if (ctxt->dict != NULL) xmlDictFree(ctxt->dict);
|
||||
ctxt->dict = ctx->dict;
|
||||
ctxt->str_xml = xmlDictLookup(ctxt->dict, BAD_CAST "xml", 3);
|
||||
ctxt->str_xmlns = xmlDictLookup(ctxt->dict, BAD_CAST "xmlns", 5);
|
||||
ctxt->str_xml_ns = xmlDictLookup(ctxt->dict, XML_XML_NAMESPACE, 36);
|
||||
ctxt->dictNames = ctx->dictNames;
|
||||
ctxt->attsDefault = ctx->attsDefault;
|
||||
ctxt->attsSpecial = ctx->attsSpecial;
|
||||
ctxt->linenumbers = ctx->linenumbers;
|
||||
|
||||
xmlParseContent(ctxt);
|
||||
|
||||
ctx->validate = ctxt->validate;
|
||||
ctx->valid = ctxt->valid;
|
||||
if ((RAW == '<') && (NXT(1) == '/')) {
|
||||
xmlFatalErr(ctxt, XML_ERR_NOT_WELL_BALANCED, NULL);
|
||||
} else if (RAW != 0) {
|
||||
xmlFatalErr(ctxt, XML_ERR_EXTRA_CONTENT, NULL);
|
||||
}
|
||||
if (ctxt->node != newDoc->children) {
|
||||
xmlFatalErr(ctxt, XML_ERR_NOT_WELL_BALANCED, NULL);
|
||||
}
|
||||
|
||||
if (!ctxt->wellFormed) {
|
||||
if (ctxt->errNo == 0)
|
||||
ret = 1;
|
||||
else
|
||||
ret = ctxt->errNo;
|
||||
} else {
|
||||
if (lst != NULL) {
|
||||
xmlNodePtr cur;
|
||||
|
||||
/*
|
||||
* Return the newly created nodeset after unlinking it from
|
||||
* they pseudo parent.
|
||||
*/
|
||||
cur = newDoc->children->children;
|
||||
*lst = cur;
|
||||
while (cur != NULL) {
|
||||
cur->parent = NULL;
|
||||
cur = cur->next;
|
||||
}
|
||||
newDoc->children->children = NULL;
|
||||
}
|
||||
ret = 0;
|
||||
}
|
||||
ctxt->sax = oldsax;
|
||||
ctxt->dict = NULL;
|
||||
ctxt->attsDefault = NULL;
|
||||
ctxt->attsSpecial = NULL;
|
||||
xmlFreeParserCtxt(ctxt);
|
||||
newDoc->intSubset = NULL;
|
||||
newDoc->extSubset = NULL;
|
||||
xmlFreeDoc(newDoc);
|
||||
|
||||
return(ret);
|
||||
userData = ctx->userData;
|
||||
return xmlParseExternalEntityPrivate(ctx->myDoc, ctx, ctx->sax,
|
||||
userData, ctx->depth + 1,
|
||||
URL, ID, lst);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -13123,25 +12955,6 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
|
||||
ctxt = xmlCreateEntityParserCtxtInternal(URL, ID, NULL, oldctxt);
|
||||
if (ctxt == NULL) return(XML_WAR_UNDECLARED_ENTITY);
|
||||
ctxt->userData = ctxt;
|
||||
if (oldctxt != NULL) {
|
||||
ctxt->_private = oldctxt->_private;
|
||||
ctxt->loadsubset = oldctxt->loadsubset;
|
||||
ctxt->validate = oldctxt->validate;
|
||||
ctxt->external = oldctxt->external;
|
||||
ctxt->record_info = oldctxt->record_info;
|
||||
ctxt->node_seq.maximum = oldctxt->node_seq.maximum;
|
||||
ctxt->node_seq.length = oldctxt->node_seq.length;
|
||||
ctxt->node_seq.buffer = oldctxt->node_seq.buffer;
|
||||
} else {
|
||||
/*
|
||||
* Doing validity checking on chunk without context
|
||||
* doesn't make sense
|
||||
*/
|
||||
ctxt->_private = NULL;
|
||||
ctxt->validate = 0;
|
||||
ctxt->external = 2;
|
||||
ctxt->loadsubset = 0;
|
||||
}
|
||||
if (sax != NULL) {
|
||||
oldsax = ctxt->sax;
|
||||
ctxt->sax = sax;
|
||||
@ -13151,28 +12964,25 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
|
||||
xmlDetectSAX2(ctxt);
|
||||
newDoc = xmlNewDoc(BAD_CAST "1.0");
|
||||
if (newDoc == NULL) {
|
||||
ctxt->node_seq.maximum = 0;
|
||||
ctxt->node_seq.length = 0;
|
||||
ctxt->node_seq.buffer = NULL;
|
||||
xmlFreeParserCtxt(ctxt);
|
||||
return(XML_ERR_INTERNAL_ERROR);
|
||||
}
|
||||
newDoc->properties = XML_DOC_INTERNAL;
|
||||
newDoc->intSubset = doc->intSubset;
|
||||
newDoc->extSubset = doc->extSubset;
|
||||
newDoc->dict = doc->dict;
|
||||
xmlDictReference(newDoc->dict);
|
||||
|
||||
if (doc->URL != NULL) {
|
||||
newDoc->URL = xmlStrdup(doc->URL);
|
||||
if (doc) {
|
||||
newDoc->intSubset = doc->intSubset;
|
||||
newDoc->extSubset = doc->extSubset;
|
||||
if (doc->dict) {
|
||||
newDoc->dict = doc->dict;
|
||||
xmlDictReference(newDoc->dict);
|
||||
}
|
||||
if (doc->URL != NULL) {
|
||||
newDoc->URL = xmlStrdup(doc->URL);
|
||||
}
|
||||
}
|
||||
newRoot = xmlNewDocNode(newDoc, NULL, BAD_CAST "pseudoroot", NULL);
|
||||
if (newRoot == NULL) {
|
||||
if (sax != NULL)
|
||||
ctxt->sax = oldsax;
|
||||
ctxt->node_seq.maximum = 0;
|
||||
ctxt->node_seq.length = 0;
|
||||
ctxt->node_seq.buffer = NULL;
|
||||
xmlFreeParserCtxt(ctxt);
|
||||
newDoc->intSubset = NULL;
|
||||
newDoc->extSubset = NULL;
|
||||
@ -13181,8 +12991,12 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
|
||||
}
|
||||
xmlAddChild((xmlNodePtr) newDoc, newRoot);
|
||||
nodePush(ctxt, newDoc->children);
|
||||
ctxt->myDoc = doc;
|
||||
newRoot->doc = doc;
|
||||
if (doc == NULL) {
|
||||
ctxt->myDoc = newDoc;
|
||||
} else {
|
||||
ctxt->myDoc = doc;
|
||||
newRoot->doc = doc;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the 4 first bytes and decode the charset
|
||||
@ -13206,10 +13020,53 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
|
||||
*/
|
||||
if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
|
||||
xmlParseTextDecl(ctxt);
|
||||
/*
|
||||
* An XML-1.0 document can't reference an entity not XML-1.0
|
||||
*/
|
||||
if ((xmlStrEqual(oldctxt->version, BAD_CAST "1.0")) &&
|
||||
(!xmlStrEqual(ctxt->input->version, BAD_CAST "1.0"))) {
|
||||
xmlFatalErrMsg(ctxt, XML_ERR_VERSION_MISMATCH,
|
||||
"Version mismatch between document and entity\n");
|
||||
}
|
||||
}
|
||||
|
||||
ctxt->instate = XML_PARSER_CONTENT;
|
||||
ctxt->depth = depth;
|
||||
if (oldctxt != NULL) {
|
||||
ctxt->_private = oldctxt->_private;
|
||||
ctxt->loadsubset = oldctxt->loadsubset;
|
||||
ctxt->validate = oldctxt->validate;
|
||||
ctxt->valid = oldctxt->valid;
|
||||
ctxt->replaceEntities = oldctxt->replaceEntities;
|
||||
if (oldctxt->validate) {
|
||||
ctxt->vctxt.error = oldctxt->vctxt.error;
|
||||
ctxt->vctxt.warning = oldctxt->vctxt.warning;
|
||||
ctxt->vctxt.userData = oldctxt->vctxt.userData;
|
||||
}
|
||||
ctxt->external = oldctxt->external;
|
||||
if (ctxt->dict) xmlDictFree(ctxt->dict);
|
||||
ctxt->dict = oldctxt->dict;
|
||||
ctxt->str_xml = xmlDictLookup(ctxt->dict, BAD_CAST "xml", 3);
|
||||
ctxt->str_xmlns = xmlDictLookup(ctxt->dict, BAD_CAST "xmlns", 5);
|
||||
ctxt->str_xml_ns = xmlDictLookup(ctxt->dict, XML_XML_NAMESPACE, 36);
|
||||
ctxt->dictNames = oldctxt->dictNames;
|
||||
ctxt->attsDefault = oldctxt->attsDefault;
|
||||
ctxt->attsSpecial = oldctxt->attsSpecial;
|
||||
ctxt->linenumbers = oldctxt->linenumbers;
|
||||
ctxt->record_info = oldctxt->record_info;
|
||||
ctxt->node_seq.maximum = oldctxt->node_seq.maximum;
|
||||
ctxt->node_seq.length = oldctxt->node_seq.length;
|
||||
ctxt->node_seq.buffer = oldctxt->node_seq.buffer;
|
||||
} else {
|
||||
/*
|
||||
* Doing validity checking on chunk without context
|
||||
* doesn't make sense
|
||||
*/
|
||||
ctxt->_private = NULL;
|
||||
ctxt->validate = 0;
|
||||
ctxt->external = 2;
|
||||
ctxt->loadsubset = 0;
|
||||
}
|
||||
|
||||
xmlParseContent(ctxt);
|
||||
|
||||
@ -13269,6 +13126,11 @@ xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlParserCtxtPtr oldctxt,
|
||||
if (sax != NULL)
|
||||
ctxt->sax = oldsax;
|
||||
if (oldctxt != NULL) {
|
||||
ctxt->dict = NULL;
|
||||
ctxt->attsDefault = NULL;
|
||||
ctxt->attsSpecial = NULL;
|
||||
oldctxt->validate = ctxt->validate;
|
||||
oldctxt->valid = ctxt->valid;
|
||||
oldctxt->node_seq.maximum = ctxt->node_seq.maximum;
|
||||
oldctxt->node_seq.length = ctxt->node_seq.length;
|
||||
oldctxt->node_seq.buffer = ctxt->node_seq.buffer;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user