gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve external subset information for validity checking

Browse source
This commit is contained in:
rfm 2025-01-17 14:46:24 +00:00
parent 3f7647f15c
commit 102b290c80
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Source/Additions/GSXML.m
View file

@ -2702,6 +2702,8 @@ loadEntityFunction(const unsigned char *url,
const unsigned char *eid,
void *ctx)
{
xmlParserCtxtPtr cp = (xmlParserCtxtPtr)ctx;
BOOL restricted = NO;
NSString *file = nil;
NSString *entityId;
NSString *location;
@ -2718,7 +2720,19 @@ loadEntityFunction(const unsigned char *url,
parser = [HANDLER parser];
if (NO == [parser _resolves])
{
return xmlNewStringInputStream(ctx, (const xmlChar *)"");
if (cp->inSubset && cp->validate)
{
/* Resolving of external entities is turned off, but we are
* doing validity checking and are loading a subset, so we
* will need that subset to perform the validity checks.
* Proceed to do loading.
*/
restricted = YES;
}
else
{
return xmlNewStringInputStream(ctx, (const xmlChar *)"");
}
}
entityId = (eid != NULL) ? (id)UTF8Str(eid) : nil;
@ -2901,10 +2915,15 @@ loadEntityFunction(const unsigned char *url,
if ([file length] > 0)
{
NSURL *theURL = [NSURL fileURLWithPath: file];
xmlCatalogAdd((const unsigned char*)"public", eid,
UTF8STRING([theURL absoluteString]));
}
else if (restricted)
{
return xmlNewStringInputStream(ctx, (const xmlChar *)"");
}
/* A local DTD will now be in the catalog: The builtin entity resolver can
* take over.
*/
@ -2915,7 +2934,7 @@ static xmlParserInputPtr
resolveEntityFunction(void *ctx,
const unsigned char *eid, const unsigned char *url)
{
NSLog(@"resolveEntityFunction called for %s %s", url, eid);
//NSLog(@"resolveEntityFunction called for %s %s", url, eid);
return loadEntityFunction(url, eid, ctx);
}