mirror/libxml2
2
0
Fork 0
mirror of https://github.com/GNOME/libxml2.git synced 2025-03-13 18:47:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

trying to fix #118754 of possible recursion in the catalogs. Not

Browse Source 
* catalog.c: trying to fix #118754 of possible recursion in the
  catalogs. Not fantastically happy about the current fix since
  it's likely to break under very thread intensive concurrent
  access to the catalog. Better solution might to keep the depth
  an extra argument to the resolution functions.
Daniel
This commit is contained in:
Daniel Veillard 2003-08-04 00:58:46 +00:00
parent 7b68df974b
commit 5ee43b0600
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sun Aug 3 20:55:40 EDT 2003 Daniel Veillard <daniel@veillard.com>
* catalog.c: trying to fix #118754 of possible recursion in the
catalogs. Not fantastically happy about the current fix since
it's likely to break under very thread intensive concurrent
access to the catalog. Better solution might to keep the depth
an extra argument to the resolution functions.
Sun Aug 3 18:56:54 EDT 2003 Daniel Veillard <daniel@veillard.com>
* valid.c: fixed bug #118712 about mixed content, and namespaced

35
catalog.c
View File

@ -42,6 +42,7 @@
#include <libxml/globals.h>
#define MAX_DELEGATE 50
#define MAX_CATAL_DEPTH 50
/**
* TODO:
@ -115,6 +116,7 @@ struct _xmlCatalogEntry {
xmlChar *URL; /* The expanded URL using the base */
xmlCatalogPrefer prefer;
int dealloc;
int depth;
};
typedef enum {
@ -230,6 +232,7 @@ xmlNewCatalogEntry(xmlCatalogEntryType type, const xmlChar *name,
ret->URL = NULL;
ret->prefer = prefer;
ret->dealloc = 0;
ret->depth = 0;
return(ret);
}
@ -1442,6 +1445,20 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
int haveDelegate = 0;
int haveNext = 0;
/*
* protection against loops
*/
if (catal->depth > MAX_CATAL_DEPTH) {
if (catal->name != NULL)
xmlGenericError(xmlGenericErrorContext,
"Detected recursion in catalog %s\n", catal->name);
else
xmlGenericError(xmlGenericErrorContext,
"Detected recursion in catalog\n");
return(NULL);
}
catal->depth++;
/*
* First tries steps 2/ 3/ 4/ if a system ID is provided.
*/
@ -1457,6 +1474,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext,
"Found system match %s\n", cur->name);
catal->depth--;
return(xmlStrdup(cur->URL));
}
break;
@ -1487,6 +1505,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
ret = xmlStrdup(rewrite->URL);
if (ret != NULL)
ret = xmlStrcat(ret, &sysID[lenrewrite]);
catal->depth--;
return(ret);
}
if (haveDelegate) {
@ -1520,8 +1539,10 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
"Trying system delegate %s\n", cur->URL);
ret = xmlCatalogListXMLResolve(
cur->children, NULL, sysID);
if (ret != NULL)
if (ret != NULL) {
catal->depth--;
return(ret);
}
}
}
cur = cur->next;
@ -1529,6 +1550,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
/*
* Apply the cut algorithm explained in 4/
*/
catal->depth--;
return(XML_CATAL_BREAK);
}
}
@ -1545,6 +1567,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
if (xmlDebugCatalogs)
xmlGenericError(xmlGenericErrorContext,
"Found public match %s\n", cur->name);
catal->depth--;
return(xmlStrdup(cur->URL));
}
break;
@ -1595,8 +1618,10 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
"Trying public delegate %s\n", cur->URL);
ret = xmlCatalogListXMLResolve(
cur->children, pubID, NULL);
if (ret != NULL)
if (ret != NULL) {
catal->depth--;
return(ret);
}
}
}
cur = cur->next;
@ -1604,6 +1629,7 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
/*
* Apply the cut algorithm explained in 4/
*/
catal->depth--;
return(XML_CATAL_BREAK);
}
}
@ -1616,14 +1642,17 @@ xmlCatalogXMLResolve(xmlCatalogEntryPtr catal, const xmlChar *pubID,
}
if (cur->children != NULL) {
ret = xmlCatalogListXMLResolve(cur->children, pubID, sysID);
if (ret != NULL)
if (ret != NULL) {
catal->depth--;
return(ret);
}
}
}
cur = cur->next;
}
}
catal->depth--;
return(NULL);
}