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: Don't report malloc failures when creating context

Browse Source 
We don't want messages to stderr before an error handler could be set on
a parser context.
This commit is contained in:
Nick Wellnhofer 2024-06-11 16:19:58 +02:00
parent ef8dc4f673
commit 89fcae4dfd
4 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HTMLparser.c
View File

@ -5817,13 +5817,17 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data,
return(NULL);
encoding = xmlGetCharEncodingName(enc);
input = xmlNewInputPush(ctxt, filename, chunk, size, encoding);
input = xmlInputCreatePush(filename, chunk, size);
if (input == NULL) {
htmlFreeParserCtxt(ctxt);
return(NULL);
}
inputPush(ctxt, input);
if (encoding != NULL)
xmlSwitchEncodingName(ctxt, encoding);
return(ctxt);
}
#endif /* LIBXML_PUSH_ENABLED */

3
include/private/parser.h
View File

@ -108,8 +108,7 @@ xmlNewInputIO(xmlParserCtxtPtr ctxt, const char *url,
void *ioCtxt,
const char *encoding, int flags);
XML_HIDDEN xmlParserInputPtr
xmlNewInputPush(xmlParserCtxtPtr ctxt, const char *url,
const char *chunk, int size, const char *encoding);
xmlInputCreatePush(const char *url, const char *chunk, int size);
XML_HIDDEN xmlChar *
xmlExpandEntitiesInAttValue(xmlParserCtxtPtr ctxt, const xmlChar *str,

11
parser.c
View File

@ -11633,7 +11633,8 @@ xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
* @filename is used as base URI to fetch external entities and for
* error reports.
*
* Returns the new parser context or NULL in case of error.
* Returns the new parser context or NULL if a memory allocation
* failed.
*/
xmlParserCtxtPtr
@ -11649,7 +11650,7 @@ xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data,
ctxt->options &= ~XML_PARSE_NODICT;
ctxt->dictNames = 1;
input = xmlNewInputPush(ctxt, filename, chunk, size, NULL);
input = xmlInputCreatePush(filename, chunk, size);
if (input == NULL) {
xmlFreeParserCtxt(ctxt);
return(NULL);
@ -13348,11 +13349,15 @@ xmlCtxtResetPush(xmlParserCtxtPtr ctxt, const char *chunk,
xmlCtxtReset(ctxt);
input = xmlNewInputPush(ctxt, filename, chunk, size, encoding);
input = xmlInputCreatePush(filename, chunk, size);
if (input == NULL)
return(1);
inputPush(ctxt, input);
if (encoding != NULL)
xmlSwitchEncodingName(ctxt, encoding);
return(0);
}

27
parserInternals.c
View File

@ -1100,7 +1100,7 @@ xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc)
}
/**
* xmlSwitchEncodingName:
* xmlSwitchInputEncodingName:
* @ctxt: the parser context, only for error reporting
* @input: the input strea,
* @encoding: the encoding name
@ -1899,37 +1899,27 @@ xmlNewInputIO(xmlParserCtxtPtr ctxt, const char *url,
}
/**
* xmlNewInputPush:
* @ctxt: parser context
* xmlInputCreatePush:
* @url: base URL (optional)
* @chunk: pointer to char array
* @size: size of array
* @encoding: character encoding (optional)
*
* Creates a new parser input for a push parser.
*
* Returns a new parser input.
* Returns a new parser input or NULL if a memory allocation failed.
*/
xmlParserInputPtr
xmlNewInputPush(xmlParserCtxtPtr ctxt, const char *url,
const char *chunk, int size, const char *encoding) {
xmlInputCreatePush(const char *url, const char *chunk, int size) {
xmlParserInputBufferPtr buf;
xmlParserInputPtr input;
buf = xmlAllocParserInputBuffer(XML_CHAR_ENCODING_NONE);
if (buf == NULL) {
xmlCtxtErrMemory(ctxt);
if (buf == NULL)
return(NULL);
}
input = xmlNewInputInternal(buf, url);
if (input == NULL) {
xmlCtxtErrMemory(ctxt);
if (input == NULL)
return(NULL);
}
if (encoding != NULL)
xmlSwitchInputEncodingName(ctxt, input, encoding);
input->flags |= XML_INPUT_PROGRESSIVE;
@ -1939,7 +1929,6 @@ xmlNewInputPush(xmlParserCtxtPtr ctxt, const char *url,
res = xmlParserInputBufferPush(input->buf, size, chunk);
xmlBufResetInput(input->buf->buffer, input);
if (res < 0) {
xmlCtxtErrIO(ctxt, input->buf->error, NULL);
xmlFreeInputStream(input);
return(NULL);
}
@ -2616,10 +2605,8 @@ xmlInitSAXParserCtxt(xmlParserCtxtPtr ctxt, const xmlSAXHandler *sax,
if (ctxt->nsdb == NULL) {
ctxt->nsdb = xmlParserNsCreate();
if (ctxt->nsdb == NULL) {
xmlCtxtErrMemory(ctxt);
if (ctxt->nsdb == NULL)
return(-1);
}
}
return(0);