shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-06-11 15:16:48 +03:00
Code

- parser.c: added xmlParseExternalEntityPrivate() to allow

Browse Source 
propagation of ctxt->_private when parsing external entities
Daniel
This commit is contained in:
Daniel Veillard 2001-05-08 10:41:44 +00:00
parent 083c2660f4
commit 257d910769
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue May 8 12:31:40 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* parser.c: added xmlParseExternalEntityPrivate() to allow
propagation of ctxt->_private when parsing external entities
Tue May 8 10:26:22 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr> Tue May 8 10:26:22 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* HTMLtree.c: fixed the bug reported by Bjorn in htmlNodeDump * HTMLtree.c: fixed the bug reported by Bjorn in htmlNodeDump

53
parser.c
View File

@ -109,6 +109,10 @@ void xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
xmlEntityPtr xmlParseStringPEReference(xmlParserCtxtPtr ctxt, xmlEntityPtr xmlParseStringPEReference(xmlParserCtxtPtr ctxt,
const xmlChar **str); const xmlChar **str);
static int
xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlSAXHandlerPtr sax,
void *user_data, int depth, const xmlChar *URL,
const xmlChar *ID, xmlNodePtr *list, void *private);
/************************************************************************ /************************************************************************
* * * *
@ -4992,9 +4996,10 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
} else if (ent->etype == } else if (ent->etype ==
XML_EXTERNAL_GENERAL_PARSED_ENTITY) { XML_EXTERNAL_GENERAL_PARSED_ENTITY) {
ctxt->depth++; ctxt->depth++;
ret = xmlParseExternalEntity(ctxt->myDoc, ret = xmlParseExternalEntityPrivate(ctxt->myDoc,
ctxt->sax, NULL, ctxt->depth, ctxt->sax, NULL, ctxt->depth,
ent->URI, ent->ExternalID, &list); ent->URI, ent->ExternalID, &list,
ctxt->_private);
ctxt->depth--; ctxt->depth--;
} else { } else {
ret = -1; ret = -1;
@ -8912,7 +8917,7 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
} }
/** /**
* xmlParseExternalEntity: * xmlParseExternalEntityPrivate:
* @doc: the document the chunk pertains to * @doc: the document the chunk pertains to
* @sax: the SAX handler bloc (possibly NULL) * @sax: the SAX handler bloc (possibly NULL)
* @user_data: The user data returned on SAX callbacks (possibly NULL) * @user_data: The user data returned on SAX callbacks (possibly NULL)
@ -8920,20 +8925,18 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx, const xmlChar *URL,
* @URL: the URL for the entity to load * @URL: the URL for the entity to load
* @ID: the System ID for the entity to load * @ID: the System ID for the entity to load
* @list: the return value for the set of parsed nodes * @list: the return value for the set of parsed nodes
* @private: extra field for the _private parser context
* *
* Parse an external general entity * Private version of xmlParseExternalEntity()
* An external general parsed entity is well-formed if it matches the
* production labeled extParsedEnt.
*
* [78] extParsedEnt ::= TextDecl? content
* *
* Returns 0 if the entity is well formed, -1 in case of args problem and * Returns 0 if the entity is well formed, -1 in case of args problem and
* the parser error code otherwise * the parser error code otherwise
*/ */
int static int
xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data, xmlParseExternalEntityPrivate(xmlDocPtr doc, xmlSAXHandlerPtr sax,
int depth, const xmlChar *URL, const xmlChar *ID, xmlNodePtr *list) { void *user_data, int depth, const xmlChar *URL,
const xmlChar *ID, xmlNodePtr *list, void *private) {
xmlParserCtxtPtr ctxt; xmlParserCtxtPtr ctxt;
xmlDocPtr newDoc; xmlDocPtr newDoc;
xmlSAXHandlerPtr oldsax = NULL; xmlSAXHandlerPtr oldsax = NULL;
@ -8956,6 +8959,7 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
ctxt = xmlCreateEntityParserCtxt(URL, ID, NULL); ctxt = xmlCreateEntityParserCtxt(URL, ID, NULL);
if (ctxt == NULL) return(-1); if (ctxt == NULL) return(-1);
ctxt->userData = ctxt; ctxt->userData = ctxt;
ctxt->_private = private;
if (sax != NULL) { if (sax != NULL) {
oldsax = ctxt->sax; oldsax = ctxt->sax;
ctxt->sax = sax; ctxt->sax = sax;
@ -9070,6 +9074,33 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
return(ret); return(ret);
} }
/**
* xmlParseExternalEntity:
* @doc: the document the chunk pertains to
* @sax: the SAX handler bloc (possibly NULL)
* @user_data: The user data returned on SAX callbacks (possibly NULL)
* @depth: Used for loop detection, use 0
* @URL: the URL for the entity to load
* @ID: the System ID for the entity to load
* @list: the return value for the set of parsed nodes
*
* Parse an external general entity
* An external general parsed entity is well-formed if it matches the
* production labeled extParsedEnt.
*
* [78] extParsedEnt ::= TextDecl? content
*
* Returns 0 if the entity is well formed, -1 in case of args problem and
* the parser error code otherwise
*/
int
xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
int depth, const xmlChar *URL, const xmlChar *ID, xmlNodePtr *list) {
return(xmlParseExternalEntityPrivate(doc, sax, user_data, depth, URL,
ID, list, NULL));
}
/** /**
* xmlParseBalancedChunkMemory: * xmlParseBalancedChunkMemory:
* @doc: the document the chunk pertains to * @doc: the document the chunk pertains to