External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 07:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: Resolve resource leak with 'cpuset'

Browse Source 
Make cpuset local to the while loop and free it once done with it each
time through the loop.  Add a sa_assert() to virBitmapParse() to keep Coverity
from believing there could be a negative return and possible resource leak.
This commit is contained in:
John Ferlan 2013-01-10 12:46:52 -05:00 committed by Ján Tomko
parent c6248f0484
commit 8bc18eaac6
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/util/virbitmap.c
View File

@ -373,6 +373,7 @@ int virBitmapParse(const char *str,
}
}
sa_assert(ret >= 0);
return ret;
parse_error:

12
src/xen/xend_internal.c
View File

@ -1113,7 +1113,6 @@ sexpr_to_xend_topology(const struct sexpr *root,
{
const char *nodeToCpu;
const char *cur;
virBitmapPtr cpuset = NULL;
int *cpuNums = NULL;
int cell, cpu, nb_cpus;
int n = 0;
@ -1131,6 +1130,7 @@ sexpr_to_xend_topology(const struct sexpr *root,
cur = nodeToCpu;
while (*cur != 0) {
virBitmapPtr cpuset = NULL;
/*
* Find the next NUMA cell described in the xend output
*/
@ -1163,28 +1163,22 @@ sexpr_to_xend_topology(const struct sexpr *root,
if (used)
cpuNums[n++] = cpu;
}
virBitmapFree(cpuset);
if (virCapabilitiesAddHostNUMACell(caps,
cell,
nb_cpus,
cpuNums) < 0)
if (virCapabilitiesAddHostNUMACell(caps, cell, nb_cpus, cpuNums) < 0)
goto memory_error;
}
VIR_FREE(cpuNums);
virBitmapFree(cpuset);
return 0;
parse_error:
virReportError(VIR_ERR_XEN_CALL, "%s", _("topology syntax error"));
error:
VIR_FREE(cpuNums);
virBitmapFree(cpuset);
return -1;
memory_error:
VIR_FREE(cpuNums);
virBitmapFree(cpuset);
virReportOOMError();
return -1;
}