External/libvirt
1
0
Fork 0
Code

virDomainDefParseBootInitOptions: Don't leak 'name' on failure

Browse Source 
One of the failure paths skips code which would assign the string from
the temporary variable to the parsed struct, thus leaking it on failure.

Closes: https://gitlab.com/libvirt/libvirt/-/issues/672
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Peter Krempa 2024-09-09 16:46:02 +02:00 committed by Pavel Hrdina
parent 2feeefc0b4
commit bc02cb9506
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf/domain_conf.c
View File

@ -17518,7 +17518,6 @@ static int
virDomainDefParseBootInitOptions(virDomainDef *def, virDomainDefParseBootInitOptions(virDomainDef *def,
xmlXPathContextPtr ctxt) xmlXPathContextPtr ctxt)
{ {
char *name = NULL;
size_t i; size_t i;
int n; int n;
g_autofree xmlNodePtr *nodes = NULL; g_autofree xmlNodePtr *nodes = NULL;
@ -17550,6 +17549,8 @@ virDomainDefParseBootInitOptions(virDomainDef *def,
def->os.initenv = g_new0(virDomainOSEnv *, n + 1); def->os.initenv = g_new0(virDomainOSEnv *, n + 1);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
g_autofree char *name = NULL;
if (!(name = virXMLPropString(nodes[i], "name"))) { if (!(name = virXMLPropString(nodes[i], "name"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("No name supplied for <initenv> element")); _("No name supplied for <initenv> element"));
@ -17565,7 +17566,7 @@ virDomainDefParseBootInitOptions(virDomainDef *def,
} }
def->os.initenv[i] = g_new0(virDomainOSEnv, 1); def->os.initenv[i] = g_new0(virDomainOSEnv, 1);
def->os.initenv[i]->name = name; def->os.initenv[i]->name = g_steal_pointer(&name);
def->os.initenv[i]->value = g_strdup((const char *)nodes[i]->children->content); def->os.initenv[i]->value = g_strdup((const char *)nodes[i]->children->content);
} }
def->os.initenv[n] = NULL; def->os.initenv[n] = NULL;