lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

3 hours of debug, this was hell:

Browse Source 
- SAX.c parser.c xpath.c: generating IDs when not validating
  from an external parsed entity was poisoning the ID has table
  with removed values. This was killing XSLT on the KDE help
  browser.
Daniel
This commit is contained in:
Daniel Veillard
2001-04-18 21:41:07 +00:00
parent ceacdd964d
commit e470df7fdd
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
parser.c
View File

@ -4217,13 +4217,16 @@ xmlParseElementChildrenContentDecl
ctxt->entity = ctxt->input;
NEXT;
if (RAW == '?') {
ret->ocur = XML_ELEMENT_CONTENT_OPT;
if (ret != NULL)
ret->ocur = XML_ELEMENT_CONTENT_OPT;
NEXT;
} else if (RAW == '*') {
ret->ocur = XML_ELEMENT_CONTENT_MULT;
if (ret != NULL)
ret->ocur = XML_ELEMENT_CONTENT_MULT;
NEXT;
} else if (RAW == '+') {
ret->ocur = XML_ELEMENT_CONTENT_PLUS;
if (ret != NULL)
ret->ocur = XML_ELEMENT_CONTENT_PLUS;
NEXT;
}
return(ret);
@ -8880,6 +8883,7 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
xmlParserCtxtPtr ctxt;
xmlDocPtr newDoc;
xmlSAXHandlerPtr oldsax = NULL;
int oldexternal = ctxt->external;
int ret = 0;
if (depth > 40) {
@ -8950,6 +8954,7 @@ xmlParseExternalEntity(xmlDocPtr doc, xmlSAXHandlerPtr sax, void *user_data,
*/
ctxt->instate = XML_PARSER_CONTENT;
ctxt->validate = 0;
ctxt->external = 2;
ctxt->loadsubset = 0;
ctxt->depth = depth;