mirror/libxml2
2
0
Fork 0
mirror of https://github.com/GNOME/libxml2.git synced 2025-02-23 18:29:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wilfried Teiken provided a hackish but working way to get context reported

Browse Source 
* parser.c: Wilfried Teiken provided a hackish but working
  way to get context reported back on entities when parsing
  with SAX and without breaking the DOM build.
Daniel
This commit is contained in:
Daniel Veillard 2002-03-18 11:45:56 +00:00
parent 1eb242413e
commit b5a60eccfd
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Mar 18 12:44:23 CET 2002 Daniel Veillard <daniel@veillard.com>
* parser.c: Wilfried Teiken provided a hackish but working
way to get context reported back on entities when parsing
with SAX and without breaking the DOM build.
Sun Mar 17 11:31:55 CET 2002 Daniel Veillard <daniel@veillard.com> Sun Mar 17 11:31:55 CET 2002 Daniel Veillard <daniel@veillard.com>
* c14n.c: applied a new patch from Aleksey Sanin * c14n.c: applied a new patch from Aleksey Sanin

16
parser.c
View File

@ -5251,17 +5251,29 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
* if its replacement text matches the production labeled * if its replacement text matches the production labeled
* content. * content.
*/ */
void *user_data;
/*
* This is a bit hackish but this seems the best
* way to make sure both SAX and DOM entity support
* behaves okay.
*/
if (ctxt->userData == ctxt)
user_data = NULL;
else
user_data = ctxt->userData;
if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) { if (ent->etype == XML_INTERNAL_GENERAL_ENTITY) {
ctxt->depth++; ctxt->depth++;
ret = xmlParseBalancedChunkMemory(ctxt->myDoc, ret = xmlParseBalancedChunkMemory(ctxt->myDoc,
ctxt->sax, NULL, ctxt->depth, ctxt->sax, user_data, ctxt->depth,
value, &list); value, &list);
ctxt->depth--; ctxt->depth--;
} else if (ent->etype == } else if (ent->etype ==
XML_EXTERNAL_GENERAL_PARSED_ENTITY) { XML_EXTERNAL_GENERAL_PARSED_ENTITY) {
ctxt->depth++; ctxt->depth++;
ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt, ret = xmlParseExternalEntityPrivate(ctxt->myDoc, ctxt,
ctxt->sax, NULL, ctxt->depth, ctxt->sax, user_data, ctxt->depth,
ent->URI, ent->ExternalID, &list); ent->URI, ent->ExternalID, &list);
ctxt->depth--; ctxt->depth--;
} else { } else {