]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
lxcFreezeContainer: avoid test-after-deref of never-NULL pointer
authorJim Meyering <meyering@redhat.com>
Mon, 17 May 2010 17:18:12 +0000 (19:18 +0200)
committerJim Meyering <meyering@redhat.com>
Tue, 18 May 2010 05:53:42 +0000 (07:53 +0200)
* src/lxc/lxc_driver.c (lxcFreezeContainer): Remove test-after-deref.
Correct indentation in expression.

src/lxc/lxc_driver.c

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