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

parser: Pass resource type to resource loader

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-06-11 19:10:41 +02:00
parent f96dca9c0e
commit 5238404325
11 changed files with 99 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SAX2.c
View File

@ -427,8 +427,8 @@ xmlSAX2ResolveEntity(void *ctx, const xmlChar *publicId,
if (xmlStrlen(URI) > XML_MAX_URI_LENGTH) {
xmlFatalErr(ctxt, XML_ERR_RESOURCE_LIMIT, "URI too long");
} else {
ret = xmlLoadExternalEntity((const char *) URI,
(const char *) publicId, ctxt);
ret = xmlLoadResource(ctxt, (const char *) URI,
(const char *) publicId, XML_RESOURCE_DTD);
}
xmlFree(URI);

4
fuzz/fuzz.c
View File

@ -404,8 +404,8 @@ xmlFuzzMainEntity(size_t *size) {
int
xmlFuzzResourceLoader(void *data ATTRIBUTE_UNUSED, const char *URL,
const char *ID ATTRIBUTE_UNUSED,
int type ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED,
xmlParserInputPtr *out) {
xmlResourceType type ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED, xmlParserInputPtr *out) {
xmlParserInputPtr input;
xmlFuzzEntityInfo *entity;

2
fuzz/fuzz.h
View File

@ -108,7 +108,7 @@ xmlFuzzMainEntity(size_t *size);
int
xmlFuzzResourceLoader(void *data, const char *URL, const char *ID,
int type, int flags, xmlParserInputPtr *out);
xmlResourceType type, int flags, xmlParserInputPtr *out);
xmlParserInputPtr
xmlFuzzEntityLoader(const char *URL, const char *ID, xmlParserCtxtPtr ctxt);

2
fuzz/genSeed.c
View File

@ -56,7 +56,7 @@ static struct {
static int
fuzzResourceRecorder(void *data ATTRIBUTE_UNUSED, const char *URL,
const char *ID ATTRIBUTE_UNUSED,
int type ATTRIBUTE_UNUSED, int flags,
xmlResourceType type ATTRIBUTE_UNUSED, int flags,
xmlParserInputPtr *out) {
xmlParserInputPtr in;
static const int chunkSize = 16384;

12
include/libxml/parser.h
View File

@ -36,6 +36,16 @@ extern "C" {
*/
#define XML_DEFAULT_VERSION "1.0"
typedef enum {
XML_RESOURCE_UNKNOWN = 0,
XML_RESOURCE_MAIN_DOCUMENT,
XML_RESOURCE_DTD,
XML_RESOURCE_GENERAL_ENTITY,
XML_RESOURCE_PARAMETER_ENTITY,
XML_RESOURCE_XINCLUDE,
XML_RESOURCE_XINCLUDE_TEXT
} xmlResourceType;
/**
* xmlParserInput:
*
@ -161,7 +171,7 @@ typedef struct _xmlAttrHashBucket xmlAttrHashBucket;
typedef int
(*xmlResourceLoader)(void *ctxt, const char *url, const char *publicId,
int type, int flags, xmlParserInputPtr *out);
xmlResourceType type, int flags, xmlParserInputPtr *out);
/**
* xmlParserCtxt:

3
include/private/parser.h
View File

@ -88,6 +88,9 @@ xmlParserNsUpdateSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix,
XML_HIDDEN void *
xmlParserNsLookupSax(xmlParserCtxtPtr ctxt, const xmlChar *prefix);
XML_HIDDEN xmlParserInputPtr
xmlLoadResource(xmlParserCtxtPtr ctxt, const char *url, const char *publicId,
xmlResourceType type);
XML_HIDDEN xmlParserInputPtr
xmlNewInputURL(xmlParserCtxtPtr ctxt, const char *url, const char *publicId,
const char *encoding, int flags);

22
parser.c
View File

@ -7883,9 +7883,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt)
* @ctxt: an XML parser context
* @entity: an unloaded system entity
*
* Load the original content of the given system entity from the
* ExternalID/SystemID given. This is to be used for Included in Literal
* http://www.w3.org/TR/REC-xml/#inliteral processing of entities references
* Load the content of an entity.
*
* Returns 0 in case of success and -1 in case of failure
*/
@ -7895,6 +7893,7 @@ xmlLoadEntityContent(xmlParserCtxtPtr ctxt, xmlEntityPtr entity) {
xmlParserInputPtr *oldinputTab;
const xmlChar *oldencoding;
xmlChar *content = NULL;
xmlResourceType rtype;
size_t length, i;
int oldinputNr, oldinputMax;
int ret = -1;
@ -7909,8 +7908,13 @@ xmlLoadEntityContent(xmlParserCtxtPtr ctxt, xmlEntityPtr entity) {
return(-1);
}
input = xmlLoadExternalEntity((char *) entity->URI,
(char *) entity->ExternalID, ctxt);
if (entity->etype == XML_EXTERNAL_PARAMETER_ENTITY)
rtype = XML_RESOURCE_PARAMETER_ENTITY;
else
rtype = XML_RESOURCE_GENERAL_ENTITY;
input = xmlLoadResource(ctxt, (char *) entity->URI,
(char *) entity->ExternalID, rtype);
if (input == NULL)
return(-1);
@ -12171,7 +12175,8 @@ xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctxt, const xmlChar *URL,
if (ctxt == NULL)
return(XML_ERR_ARGUMENT);
input = xmlLoadExternalEntity((char *)URL, (char *)ID, ctxt);
input = xmlLoadResource(ctxt, (char *) URL, (char *) ID,
XML_RESOURCE_GENERAL_ENTITY);
if (input == NULL)
return(ctxt->errNo);
@ -12637,7 +12642,8 @@ xmlCreateEntityParserCtxt(const xmlChar *URL, const xmlChar *ID,
URL = uri;
}
input = xmlLoadExternalEntity((char *)URL, (char *)ID, ctxt);
input = xmlLoadResource(ctxt, (char *) URL, (char *) ID,
XML_RESOURCE_UNKNOWN);
if (input == NULL)
goto error;
@ -12685,7 +12691,7 @@ xmlCreateURLParserCtxt(const char *filename, int options)
xmlCtxtUseOptions(ctxt, options);
ctxt->linenumbers = 1;
input = xmlLoadExternalEntity(filename, NULL, ctxt);
input = xmlLoadResource(ctxt, filename, NULL, XML_RESOURCE_MAIN_DOCUMENT);
if (input == NULL) {
xmlFreeParserCtxt(ctxt);
return(NULL);

94
parserInternals.c
View File

@ -1575,7 +1575,7 @@ xmlNewInputURL(xmlParserCtxtPtr ctxt, const char *url, const char *publicId,
if ((ctxt == NULL) || (url == NULL))
return(NULL);
input = xmlLoadExternalEntity(url, publicId, ctxt);
input = xmlLoadResource(ctxt, url, publicId, XML_RESOURCE_MAIN_DOCUMENT);
if (input == NULL)
return(NULL);
@ -1992,8 +1992,15 @@ xmlNewEntityInputStream(xmlParserCtxtPtr ctxt, xmlEntityPtr ent) {
input = xmlNewInputString(ctxt, NULL, (const char *) ent->content,
NULL, XML_INPUT_BUF_STATIC);
} else if (ent->URI != NULL) {
input = xmlLoadExternalEntity((char *) ent->URI,
(char *) ent->ExternalID, ctxt);
xmlResourceType rtype;
if (ent->etype == XML_EXTERNAL_PARAMETER_ENTITY)
rtype = XML_RESOURCE_PARAMETER_ENTITY;
else
rtype = XML_RESOURCE_GENERAL_ENTITY;
input = xmlLoadResource(ctxt, (char *) ent->URI,
(char *) ent->ExternalID, rtype);
} else {
return(NULL);
}
@ -2381,6 +2388,53 @@ xmlCtxtSetResourceLoader(xmlParserCtxtPtr ctxt, xmlResourceLoader loader,
ctxt->resourceCtxt = vctxt;
}
/**
* xmlLoadResource:
* @ctxt: parser context
* @url: the URL for the entity to load
* @publicId: the Public ID for the entity to load
* @type: resource type
*
* Returns the xmlParserInputPtr or NULL in case of error.
*/
xmlParserInputPtr
xmlLoadResource(xmlParserCtxtPtr ctxt, const char *url, const char *publicId,
xmlResourceType type) {
char *canonicFilename;
xmlParserInputPtr ret;
if (url == NULL)
return(NULL);
if ((ctxt != NULL) && (ctxt->resourceLoader != NULL)) {
int flags = 0;
int code;
if ((ctxt->options & XML_PARSE_NO_UNZIP) == 0)
flags |= XML_INPUT_UNZIP;
if ((ctxt->options & XML_PARSE_NONET) == 0)
flags |= XML_INPUT_NETWORK;
code = ctxt->resourceLoader(ctxt->resourceCtxt, url, publicId, flags,
type, &ret);
if (code != XML_ERR_OK) {
xmlCtxtErrIO(ctxt, code, url);
return(NULL);
}
return(ret);
}
canonicFilename = (char *) xmlCanonicPath((const xmlChar *) url);
if (canonicFilename == NULL) {
xmlCtxtErrMemory(ctxt);
return(NULL);
}
ret = xmlCurrentExternalEntityLoader(canonicFilename, publicId, ctxt);
xmlFree(canonicFilename);
return(ret);
}
/**
* xmlLoadExternalEntity:
* @URL: the URL for the entity to load
@ -2414,39 +2468,7 @@ xmlCtxtSetResourceLoader(xmlParserCtxtPtr ctxt, xmlResourceLoader loader,
xmlParserInputPtr
xmlLoadExternalEntity(const char *URL, const char *ID,
xmlParserCtxtPtr ctxt) {
char *canonicFilename;
xmlParserInputPtr ret;
if (URL == NULL)
return(NULL);
if ((ctxt != NULL) && (ctxt->resourceLoader != NULL)) {
int flags = 0;
int code;
if ((ctxt->options & XML_PARSE_NO_UNZIP) == 0)
flags |= XML_INPUT_UNZIP;
if ((ctxt->options & XML_PARSE_NONET) == 0)
flags |= XML_INPUT_NETWORK;
code = ctxt->resourceLoader(ctxt->resourceCtxt, URL, ID, flags,
0, &ret);
if (code != XML_ERR_OK) {
xmlCtxtErrIO(ctxt, code, URL);
return(NULL);
}
return(ret);
}
canonicFilename = (char *) xmlCanonicPath((const xmlChar *) URL);
if (canonicFilename == NULL) {
xmlCtxtErrMemory(ctxt);
return(NULL);
}
ret = xmlCurrentExternalEntityLoader(canonicFilename, ID, ctxt);
xmlFree(canonicFilename);
return(ret);
return(xmlLoadResource(ctxt, URL, ID, XML_RESOURCE_UNKNOWN));
}
/************************************************************************

3
runsuite.c
View File

@ -115,7 +115,8 @@ static int addEntity(char *name, char *content) {
static int
testResourceLoader(void *vctxt ATTRIBUTE_UNUSED, const char *URL,
const char *ID ATTRIBUTE_UNUSED, int type ATTRIBUTE_UNUSED,
const char *ID ATTRIBUTE_UNUSED,
xmlResourceType type ATTRIBUTE_UNUSED,
int flags ATTRIBUTE_UNUSED, xmlParserInputPtr *out) {
int i;

6
xinclude.c
View File

@ -28,6 +28,7 @@
#include "private/buf.h"
#include "private/error.h"
#include "private/parser.h"
#include "private/tree.h"
#include "private/xinclude.h"
@ -342,7 +343,7 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
xmlCtxtUseOptions(pctxt, ctxt->parseFlags);
inputStream = xmlLoadExternalEntity(URL, NULL, pctxt);
inputStream = xmlLoadResource(pctxt, URL, NULL, XML_RESOURCE_XINCLUDE);
if (inputStream == NULL)
goto error;
@ -1656,7 +1657,8 @@ xmlXIncludeLoadTxt(xmlXIncludeCtxtPtr ctxt, xmlXIncludeRefPtr ref) {
xmlCtxtSetResourceLoader(pctxt, ctxt->resourceLoader,
ctxt->resourceCtxt);
inputStream = xmlLoadExternalEntity((const char*)url, NULL, pctxt);
inputStream = xmlLoadResource(pctxt, (const char*) url, NULL,
XML_RESOURCE_XINCLUDE_TEXT);
if (inputStream == NULL) {
if (pctxt->errNo == XML_ERR_NO_MEMORY)
xmlXIncludeErrMemory(ctxt);

2
xmllint.c
View File

@ -228,7 +228,7 @@ static xmlResourceLoader defaultResourceLoader = NULL;
static int
xmllintResourceLoader(void *ctxt ATTRIBUTE_UNUSED, const char *URL,
const char *ID, int type, int flags,
const char *ID, xmlResourceType type, int flags,
xmlParserInputPtr *out) {
int code;
int i;