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

xmllint: Fix memory leak in walkDoc

Browse Source
This commit is contained in:
Nick Wellnhofer 2024-05-06 02:34:01 +02:00
parent a7854e2646
commit 907a5a4885
1 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
xmllint.c
View File

@ -1939,45 +1939,51 @@ static void walkDoc(xmlDocPtr doc) {
int ret; int ret;
#ifdef LIBXML_PATTERN_ENABLED #ifdef LIBXML_PATTERN_ENABLED
xmlNodePtr root;
const xmlChar *namespaces[22];
int i;
xmlNsPtr ns;
root = xmlDocGetRootElement(doc);
if (root == NULL ) {
fprintf(ERR_STREAM,
"Document does not have a root element");
progresult = XMLLINT_ERR_UNCLASS;
return;
}
for (ns = root->nsDef, i = 0;ns != NULL && i < 20;ns=ns->next) {
namespaces[i++] = ns->href;
namespaces[i++] = ns->prefix;
}
namespaces[i++] = NULL;
namespaces[i] = NULL;
if (pattern != NULL) { if (pattern != NULL) {
patternc = xmlPatterncompile((const xmlChar *) pattern, doc->dict, xmlNodePtr root;
0, &namespaces[0]); const xmlChar *namespaces[22];
int i;
xmlNsPtr ns;
root = xmlDocGetRootElement(doc);
if (root == NULL ) {
fprintf(ERR_STREAM,
"Document does not have a root element");
progresult = XMLLINT_ERR_UNCLASS;
return;
}
for (ns = root->nsDef, i = 0;ns != NULL && i < 20;ns=ns->next) {
namespaces[i++] = ns->href;
namespaces[i++] = ns->prefix;
}
namespaces[i++] = NULL;
namespaces[i] = NULL;
ret = xmlPatternCompileSafe((const xmlChar *) pattern, doc->dict,
0, &namespaces[0], &patternc);
if (patternc == NULL) { if (patternc == NULL) {
fprintf(ERR_STREAM, if (ret < 0) {
"Pattern %s failed to compile\n", pattern); progresult = XMLLINT_ERR_MEM;
progresult = XMLLINT_ERR_SCHEMAPAT; } else {
pattern = NULL; fprintf(ERR_STREAM,
} "Pattern %s failed to compile\n", pattern);
} progresult = XMLLINT_ERR_SCHEMAPAT;
if (patternc != NULL) {
patstream = xmlPatternGetStreamCtxt(patternc);
if (patstream != NULL) {
ret = xmlStreamPush(patstream, NULL, NULL);
if (ret < 0) {
fprintf(ERR_STREAM, "xmlStreamPush() failure\n");
xmlFreeStreamCtxt(patstream);
patstream = NULL;
} }
goto error;
} }
patstream = xmlPatternGetStreamCtxt(patternc);
if (patstream == NULL) {
progresult = XMLLINT_ERR_MEM;
goto error;
}
ret = xmlStreamPush(patstream, NULL, NULL);
if (ret < 0) {
fprintf(ERR_STREAM, "xmlStreamPush() failure\n");
progresult = XMLLINT_ERR_MEM;
goto error;
}
} }
#endif /* LIBXML_PATTERN_ENABLED */ #endif /* LIBXML_PATTERN_ENABLED */
reader = xmlReaderWalker(doc); reader = xmlReaderWalker(doc);
@ -2007,7 +2013,13 @@ static void walkDoc(xmlDocPtr doc) {
fprintf(ERR_STREAM, "Failed to crate a reader from the document\n"); fprintf(ERR_STREAM, "Failed to crate a reader from the document\n");
progresult = XMLLINT_ERR_UNCLASS; progresult = XMLLINT_ERR_UNCLASS;
} }
#ifdef LIBXML_PATTERN_ENABLED #ifdef LIBXML_PATTERN_ENABLED
error:
if (patternc != NULL) {
xmlFreePattern(patternc);
patternc = NULL;
}
if (patstream != NULL) { if (patstream != NULL) {
xmlFreeStreamCtxt(patstream); xmlFreeStreamCtxt(patstream);
patstream = NULL; patstream = NULL;