lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-24 13:33:01 +03:00
Code Activity

parser: Report malloc failure in xmlNewInputFromFile

Browse Source
This commit is contained in:
Nick Wellnhofer
2024-05-14 15:58:44 +02:00
parent 8d215ac5cc
commit ec2f68f164
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
parserInternals.c
View File

@@ -2033,7 +2033,8 @@ xmlParserInputPtr
xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) { xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
xmlParserInputBufferPtr buf; xmlParserInputBufferPtr buf;
xmlParserInputPtr inputStream; xmlParserInputPtr inputStream;
xmlChar *URI = NULL; const xmlChar *URI;
xmlChar *canonic;
int code; int code;
if ((ctxt == NULL) || (filename == NULL)) if ((ctxt == NULL) || (filename == NULL))
@@ -2058,12 +2059,18 @@ xmlNewInputFromFile(xmlParserCtxtPtr ctxt, const char *filename) {
return(NULL); return(NULL);
if (inputStream->filename == NULL) if (inputStream->filename == NULL)
URI = xmlStrdup((xmlChar *) filename); URI = (xmlChar *) filename;
else else
URI = xmlStrdup((xmlChar *) inputStream->filename); URI = (xmlChar *) inputStream->filename;
if (inputStream->filename != NULL) xmlFree((char *)inputStream->filename); canonic = xmlCanonicPath(URI);
inputStream->filename = (char *) xmlCanonicPath((const xmlChar *) URI); if (canonic == NULL) {
if (URI != NULL) xmlFree((char *) URI); xmlCtxtErrMemory(ctxt);
xmlFreeInputStream(inputStream);
return(NULL);
}
if (inputStream->filename != NULL)
xmlFree((char *) inputStream->filename);
inputStream->filename = (char *) canonic;
xmlBufResetInput(inputStream->buf->buffer, inputStream); xmlBufResetInput(inputStream->buf->buffer, inputStream);