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

Avoid extra processing on entities

Browse Source 
If an entity has already been checked for correctness no
need to check it on every reference
This commit is contained in:
Daniel Veillard 2013-03-11 13:57:53 +08:00
parent a09890684c
commit a3f1e3e571
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SAX2.c
View File

@ -591,6 +591,7 @@ xmlSAX2GetEntity(void *ctx, const xmlChar *name)
* parse the external entity
*/
xmlNodePtr children;
unsigned long oldnbent = ctxt->nbentities;
val = xmlParseCtxtExternalEntity(ctxt, ret->URI,
ret->ExternalID, &children);
@ -603,8 +604,9 @@ xmlSAX2GetEntity(void *ctx, const xmlChar *name)
return(NULL);
}
ret->owner = 1;
if (ret->checked == 0)
ret->checked = 1;
if (ret->checked == 0) {
ret->checked = ctxt->nbentities - oldnbent + 1;
}
}
return(ret);
}

8
parser.c
View File

@ -4044,9 +4044,13 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
* entities problems
*/
if ((ent->etype != XML_INTERNAL_PREDEFINED_ENTITY) &&
(ent->content != NULL)) {
(ent->content != NULL) && (ent->checked == 0)) {
unsigned long oldnbent = ctxt->nbentities;
rep = xmlStringDecodeEntities(ctxt, ent->content,
XML_SUBSTITUTE_REF, 0, 0, 0);
ent->checked = ctxt->nbentities - oldnbent + 1;
if (rep != NULL) {
xmlFree(rep);
rep = NULL;
@ -7213,7 +7217,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
* Store the number of entities needing parsing for this entity
* content and do checkings
*/
ent->checked = ctxt->nbentities - oldnbent;
ent->checked = ctxt->nbentities - oldnbent + 1;
if (ret == XML_ERR_ENTITY_LOOP) {
xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
xmlFreeNodeList(list);

2
result/att11.sax
View File

@ -12,9 +12,7 @@ SAX.externalSubset(attributes, , )
SAX.getEntity(ent)
SAX.getEntity(recursive)
SAX.getEntity(ent)
SAX.getEntity(recursive)
SAX.getEntity(ent)
SAX.getEntity(recursive)
SAX.startElement(attributes, nmtoken=' &ent; &ent; &ent; ', nmtokens=' Test
this normalization ')
SAX.endElement(attributes)

2
result/att11.sax2
View File

@ -12,9 +12,7 @@ SAX.externalSubset(attributes, , )
SAX.getEntity(ent)
SAX.getEntity(recursive)
SAX.getEntity(ent)
SAX.getEntity(recursive)
SAX.getEntity(ent)
SAX.getEntity(recursive)
SAX.startElementNs(attributes, NULL, NULL, 0, 2, 0, nmtoken='&ent...', 17, nmtokens='Test...', 25)
SAX.endElementNs(attributes, NULL, NULL)
SAX.endDocument()