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

lxcFreezeContainer: avoid test-after-deref of never-NULL pointer

Browse Source 
* src/lxc/lxc_driver.c (lxcFreezeContainer): Remove test-after-deref.
Correct indentation in expression.
This commit is contained in:
Jim Meyering 2010-05-17 19:18:12 +02:00
parent 61fb697977
commit 93fedcf20f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lxc/lxc_driver.c
View File

@ -2306,9 +2306,11 @@ static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm)
virCgroupPtr cgroup = NULL; virCgroupPtr cgroup = NULL;
if (!(driver->cgroup && if (!(driver->cgroup &&
virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0)) virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0))
return -1; return -1;
/* From here on, we know that cgroup != NULL. */
while (waited_time < timeout) { while (waited_time < timeout) {
int r; int r;
/* /*
@ -2381,8 +2383,7 @@ error:
ret = -1; ret = -1;
cleanup: cleanup:
if (cgroup) virCgroupFree(&cgroup);
virCgroupFree(&cgroup);
VIR_FREE(state); VIR_FREE(state);
return ret; return ret;
} }