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: Rename inputPush to xmlCtxtPushInput

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-11-17 20:13:14 +01:00
parent e2ad249c23
commit 0f4f89005d
9 changed files with 80 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
HTMLparser.c
View File

@ -4293,7 +4293,7 @@ htmlCtxtParseContentInternal(htmlParserCtxtPtr ctxt, xmlParserInputPtr input) {
htmlnamePop(ctxt); htmlnamePop(ctxt);
/* xmlPopInput would free the stream */ /* xmlPopInput would free the stream */
inputPop(ctxt); xmlCtxtPopInput(ctxt);
xmlFreeNode(root); xmlFreeNode(root);
return(list); return(list);
@ -4606,7 +4606,7 @@ htmlCreateMemoryParserCtxtInternal(const char *url,
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -4664,7 +4664,7 @@ htmlCreateDocParserCtxt(const xmlChar *str, const char *url,
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -5301,7 +5301,7 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data,
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -5411,7 +5411,7 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding)
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -5596,7 +5596,7 @@ htmlCtxtReset(htmlParserCtxtPtr ctxt)
dict = ctxt->dict; dict = ctxt->dict;
while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */ while ((input = xmlCtxtPopInput(ctxt)) != NULL) { /* Non consuming */
xmlFreeInputStream(input); xmlFreeInputStream(input);
} }
ctxt->inputNr = 0; ctxt->inputNr = 0;
@ -5892,9 +5892,9 @@ htmlCtxtParseDocument(htmlParserCtxtPtr ctxt, xmlParserInputPtr input)
/* assert(ctxt->inputNr == 0); */ /* assert(ctxt->inputNr == 0); */
while (ctxt->inputNr > 0) while (ctxt->inputNr > 0)
xmlFreeInputStream(inputPop(ctxt)); xmlFreeInputStream(xmlCtxtPopInput(ctxt));
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
return(NULL); return(NULL);
} }
@ -5912,7 +5912,7 @@ htmlCtxtParseDocument(htmlParserCtxtPtr ctxt, xmlParserInputPtr input)
/* assert(ctxt->inputNr == 1); */ /* assert(ctxt->inputNr == 1); */
while (ctxt->inputNr > 0) while (ctxt->inputNr > 0)
xmlFreeInputStream(inputPop(ctxt)); xmlFreeInputStream(xmlCtxtPopInput(ctxt));
return(ret); return(ret);
} }

2
catalog.c
View File

@ -897,7 +897,7 @@ xmlParseCatalogFile(const char *filename) {
inputStream->buf = buf; inputStream->buf = buf;
xmlBufResetInput(buf->buffer, inputStream); xmlBufResetInput(buf->buffer, inputStream);
if (inputPush(ctxt, inputStream) < 0) { if (xmlCtxtPushInput(ctxt, inputStream) < 0) {
xmlFreeInputStream(inputStream); xmlFreeInputStream(inputStream);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);

5
include/libxml/parserInternals.h
View File

@ -343,6 +343,11 @@ XML_DEPRECATED
XMLPUBFUN xmlParserInputPtr XMLPUBFUN xmlParserInputPtr
xmlNewEntityInputStream (xmlParserCtxtPtr ctxt, xmlNewEntityInputStream (xmlParserCtxtPtr ctxt,
xmlEntityPtr entity); xmlEntityPtr entity);
XMLPUBFUN int
xmlCtxtPushInput (xmlParserCtxtPtr ctxt,
xmlParserInputPtr input);
XMLPUBFUN xmlParserInputPtr
xmlCtxtPopInput (xmlParserCtxtPtr ctxt);
XML_DEPRECATED XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlPushInput (xmlParserCtxtPtr ctxt, xmlPushInput (xmlParserCtxtPtr ctxt,

88
parser.c
View File

@ -1931,7 +1931,7 @@ mem_error:
} }
/** /**
* inputPush: * xmlCtxtPushInput:
* @ctxt: an XML parser context * @ctxt: an XML parser context
* @value: the parser input * @value: the parser input
* *
@ -1940,13 +1940,22 @@ mem_error:
* Returns -1 in case of error, the index in the stack otherwise * Returns -1 in case of error, the index in the stack otherwise
*/ */
int int
inputPush(xmlParserCtxtPtr ctxt, xmlParserInputPtr value) xmlCtxtPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr value)
{ {
char *directory = NULL; char *directory = NULL;
int maxDepth;
if ((ctxt == NULL) || (value == NULL)) if ((ctxt == NULL) || (value == NULL))
return(-1); return(-1);
maxDepth = (ctxt->options & XML_PARSE_HUGE) ? 40 : 20;
if (ctxt->inputNr > maxDepth) {
xmlFatalErrMsg(ctxt, XML_ERR_RESOURCE_LIMIT,
"Maximum entity nesting depth exceeded");
xmlHaltParser(ctxt);
return(-1);
}
if (ctxt->inputNr >= ctxt->inputMax) { if (ctxt->inputNr >= ctxt->inputMax) {
size_t newSize = ctxt->inputMax * 2; size_t newSize = ctxt->inputMax * 2;
xmlParserInputPtr *tmp; xmlParserInputPtr *tmp;
@ -1991,8 +2000,9 @@ inputPush(xmlParserCtxtPtr ctxt, xmlParserInputPtr value)
return(ctxt->inputNr++); return(ctxt->inputNr++);
} }
/** /**
* inputPop: * xmlCtxtPopInput:
* @ctxt: an XML parser context * @ctxt: an XML parser context
* *
* Pops the top parser input from the input stack * Pops the top parser input from the input stack
@ -2000,7 +2010,7 @@ inputPush(xmlParserCtxtPtr ctxt, xmlParserInputPtr value)
* Returns the input just removed * Returns the input just removed
*/ */
xmlParserInputPtr xmlParserInputPtr
inputPop(xmlParserCtxtPtr ctxt) xmlCtxtPopInput(xmlParserCtxtPtr ctxt)
{ {
xmlParserInputPtr ret; xmlParserInputPtr ret;
@ -2017,6 +2027,34 @@ inputPop(xmlParserCtxtPtr ctxt)
ctxt->inputTab[ctxt->inputNr] = NULL; ctxt->inputTab[ctxt->inputNr] = NULL;
return (ret); return (ret);
} }
/**
* inputPush:
* @ctxt: an XML parser context
* @value: the parser input
*
* Pushes a new parser input on top of the input stack
*
* Returns -1 in case of error, the index in the stack otherwise
*/
int
inputPush(xmlParserCtxtPtr ctxt, xmlParserInputPtr value)
{
return(xmlCtxtPushInput(ctxt, value));
}
/**
* inputPop:
* @ctxt: an XML parser context
*
* Pops the top parser input from the input stack
*
* Returns the input just removed
*/
xmlParserInputPtr
inputPop(xmlParserCtxtPtr ctxt)
{
return(xmlCtxtPopInput(ctxt));
}
/** /**
* nodePush: * nodePush:
* @ctxt: an XML parser context * @ctxt: an XML parser context
@ -2561,7 +2599,7 @@ xmlPopInput(xmlParserCtxtPtr ctxt) {
xmlParserInputPtr input; xmlParserInputPtr input;
if ((ctxt == NULL) || (ctxt->inputNr <= 1)) return(0); if ((ctxt == NULL) || (ctxt->inputNr <= 1)) return(0);
input = inputPop(ctxt); input = xmlCtxtPopInput(ctxt);
xmlFreeInputStream(input); xmlFreeInputStream(input);
if (*ctxt->input->cur == 0) if (*ctxt->input->cur == 0)
xmlParserGrow(ctxt); xmlParserGrow(ctxt);
@ -2581,20 +2619,12 @@ xmlPopInput(xmlParserCtxtPtr ctxt) {
*/ */
int int
xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) { xmlPushInput(xmlParserCtxtPtr ctxt, xmlParserInputPtr input) {
int maxDepth;
int ret; int ret;
if ((ctxt == NULL) || (input == NULL)) if ((ctxt == NULL) || (input == NULL))
return(-1); return(-1);
maxDepth = (ctxt->options & XML_PARSE_HUGE) ? 40 : 20; ret = xmlCtxtPushInput(ctxt, input);
if (ctxt->inputNr > maxDepth) {
xmlFatalErrMsg(ctxt, XML_ERR_RESOURCE_LIMIT,
"Maximum entity nesting depth exceeded");
xmlHaltParser(ctxt);
return(-1);
}
ret = inputPush(ctxt, input);
if (ret >= 0) if (ret >= 0)
GROW; GROW;
return(ret); return(ret);
@ -7984,7 +8014,7 @@ xmlLoadEntityContent(xmlParserCtxtPtr ctxt, xmlEntityPtr entity) {
xmlBufResetInput(input->buf->buffer, input); xmlBufResetInput(input->buf->buffer, input);
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
goto error; goto error;
} }
@ -8053,7 +8083,7 @@ xmlLoadEntityContent(xmlParserCtxtPtr ctxt, xmlEntityPtr entity) {
error: error:
while (ctxt->inputNr > 0) while (ctxt->inputNr > 0)
xmlFreeInputStream(inputPop(ctxt)); xmlFreeInputStream(xmlCtxtPopInput(ctxt));
xmlFree(ctxt->inputTab); xmlFree(ctxt->inputTab);
xmlFree((xmlChar *) ctxt->encoding); xmlFree((xmlChar *) ctxt->encoding);
@ -11650,7 +11680,7 @@ xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data,
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -11709,7 +11739,7 @@ xmlCreateIOParserCtxt(xmlSAXHandlerPtr sax, void *user_data,
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return (NULL); return (NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -12019,7 +12049,7 @@ xmlCtxtParseContentInternal(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
spacePop(ctxt); spacePop(ctxt);
/* xmlPopInput would free the stream */ /* xmlPopInput would free the stream */
inputPop(ctxt); xmlCtxtPopInput(ctxt);
error: error:
xmlFreeNode(root); xmlFreeNode(root);
@ -12672,7 +12702,7 @@ xmlCreateEntityParserCtxt(const xmlChar *URL, const xmlChar *ID,
if (input == NULL) if (input == NULL)
goto error; goto error;
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
goto error; goto error;
} }
@ -12723,7 +12753,7 @@ xmlCreateURLParserCtxt(const char *filename, int options)
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -12908,7 +12938,7 @@ xmlSetupParserForBuffer(xmlParserCtxtPtr ctxt, const xmlChar* buffer,
NULL, 0); NULL, 0);
if (input == NULL) if (input == NULL)
return; return;
if (inputPush(ctxt, input) < 0) if (xmlCtxtPushInput(ctxt, input) < 0)
xmlFreeInputStream(input); xmlFreeInputStream(input);
} }
@ -12996,7 +13026,7 @@ xmlCreateMemoryParserCtxt(const char *buffer, int size) {
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -13186,7 +13216,7 @@ xmlCreateDocParserCtxt(const xmlChar *str) {
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
} }
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
return(NULL); return(NULL);
@ -13295,7 +13325,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
dict = ctxt->dict; dict = ctxt->dict;
while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */ while ((input = xmlCtxtPopInput(ctxt)) != NULL) { /* Non consuming */
xmlFreeInputStream(input); xmlFreeInputStream(input);
} }
ctxt->inputNr = 0; ctxt->inputNr = 0;
@ -13404,7 +13434,7 @@ xmlCtxtResetPush(xmlParserCtxtPtr ctxt, const char *chunk,
if (input == NULL) if (input == NULL)
return(1); return(1);
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
return(1); return(1);
} }
@ -13796,9 +13826,9 @@ xmlCtxtParseDocument(xmlParserCtxtPtr ctxt, xmlParserInputPtr input)
/* assert(ctxt->inputNr == 0); */ /* assert(ctxt->inputNr == 0); */
while (ctxt->inputNr > 0) while (ctxt->inputNr > 0)
xmlFreeInputStream(inputPop(ctxt)); xmlFreeInputStream(xmlCtxtPopInput(ctxt));
if (inputPush(ctxt, input) < 0) { if (xmlCtxtPushInput(ctxt, input) < 0) {
xmlFreeInputStream(input); xmlFreeInputStream(input);
return(NULL); return(NULL);
} }
@ -13819,7 +13849,7 @@ xmlCtxtParseDocument(xmlParserCtxtPtr ctxt, xmlParserInputPtr input)
/* assert(ctxt->inputNr == 1); */ /* assert(ctxt->inputNr == 1); */
while (ctxt->inputNr > 0) while (ctxt->inputNr > 0)
xmlFreeInputStream(inputPop(ctxt)); xmlFreeInputStream(xmlCtxtPopInput(ctxt));
return(ret); return(ret);
} }

4
parserInternals.c
View File

@ -2755,7 +2755,7 @@ xmlInitSAXParserCtxt(xmlParserCtxtPtr ctxt, const xmlSAXHandler *sax,
} }
if (ctxt->inputTab == NULL) if (ctxt->inputTab == NULL)
return(-1); return(-1);
while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */ while ((input = xmlCtxtPopInput(ctxt)) != NULL) { /* Non consuming */
xmlFreeInputStream(input); xmlFreeInputStream(input);
} }
ctxt->inputNr = 0; ctxt->inputNr = 0;
@ -2896,7 +2896,7 @@ xmlFreeParserCtxt(xmlParserCtxtPtr ctxt)
if (ctxt == NULL) return; if (ctxt == NULL) return;
while ((input = inputPop(ctxt)) != NULL) { /* Non consuming */ while ((input = xmlCtxtPopInput(ctxt)) != NULL) { /* Non consuming */
xmlFreeInputStream(input); xmlFreeInputStream(input);
} }
if (ctxt->spaceTab != NULL) xmlFree(ctxt->spaceTab); if (ctxt->spaceTab != NULL) xmlFree(ctxt->spaceTab);

2
testchar.c
View File

@ -667,7 +667,7 @@ static int testCharRanges(void) {
input->cur = input->cur =
input->base = xmlBufContent(input->buf->buffer); input->base = xmlBufContent(input->buf->buffer);
input->end = input->base + 4; input->end = input->base + 4;
inputPush(ctxt, input); xmlCtxtPushInput(ctxt, input);
printf("testing char range: 1"); printf("testing char range: 1");
fflush(stdout); fflush(stdout);

2
xinclude.c
View File

@ -351,7 +351,7 @@ xmlXIncludeParseFile(xmlXIncludeCtxtPtr ctxt, const char *URL) {
if (inputStream == NULL) if (inputStream == NULL)
goto error; goto error;
if (inputPush(pctxt, inputStream) < 0) { if (xmlCtxtPushInput(pctxt, inputStream) < 0) {
xmlFreeInputStream(inputStream); xmlFreeInputStream(inputStream);
goto error; goto error;
} }

2
xmlreader.c
View File

@ -4919,7 +4919,7 @@ xmlTextReaderSetup(xmlTextReaderPtr reader,
inputStream->buf = buf; inputStream->buf = buf;
xmlBufResetInput(buf->buffer, inputStream); xmlBufResetInput(buf->buffer, inputStream);
if (inputPush(reader->ctxt, inputStream) < 0) { if (xmlCtxtPushInput(reader->ctxt, inputStream) < 0) {
xmlFreeInputStream(inputStream); xmlFreeInputStream(inputStream);
return(-1); return(-1);
} }

2
xmlschemas.c
View File

@ -28806,7 +28806,7 @@ xmlSchemaValidateStream(xmlSchemaValidCtxtPtr ctxt,
ret = -1; ret = -1;
goto done; goto done;
} }
if (inputPush(pctxt, inputStream) < 0) { if (xmlCtxtPushInput(pctxt, inputStream) < 0) {
xmlFreeInputStream(inputStream); xmlFreeInputStream(inputStream);
ret = -1; ret = -1;
goto done; goto done;