External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Resolve Coverity RESOURCE_LEAK

Browse Source 
Recent changes to the -M/--machine processing code in qemuParseCommandLine
caused Coverity to determine there was a possible resource leak with how
the 'list' is managed. Rather than try to add virStringFreeList calls
everywhere - just promote list to the top of the variables and free it
within the error processing code. Also required a couple of other tweaks
in order to avoid double free's.
This commit is contained in:
John Ferlan 2015-05-18 09:16:53 -04:00
parent c214f56a82
commit 2f9f7b5fc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -12412,6 +12412,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
size_t i;
bool nographics = false;
bool fullscreen = false;
char **list = NULL;
char *path;
size_t nnics = 0;
const char **nics = NULL;
@ -12879,7 +12880,6 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
VIR_FREE(def->name);
} else if (STREQ(arg, "-M") ||
STREQ(arg, "-machine")) {
char **list;
char *param;
size_t j = 0;
@ -12894,10 +12894,8 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
if (STRPREFIX(param, "type="))
param += strlen("type=");
if (!strchr(param, '=')) {
if (VIR_STRDUP(def->os.machine, param) < 0) {
virStringFreeList(list);
if (VIR_STRDUP(def->os.machine, param) < 0)
goto error;
}
j++;
}
@ -12942,6 +12940,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
}
}
virStringFreeList(list);
list = NULL;
} else if (STREQ(arg, "-serial")) {
WANT_VALUE();
if (STRNEQ(val, "none")) {
@ -13415,6 +13414,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
virDomainDiskDefFree(disk);
qemuDomainCmdlineDefFree(cmd);
virDomainDefFree(def);
virStringFreeList(list);
VIR_FREE(nics);
if (monConfig) {
virDomainChrSourceDefFree(*monConfig);