From: Jim Meyering <meyering@redhat.com>
Date: Mon, 17 May 2010 17:18:12 +0000 (+0200)
Subject: lxcFreezeContainer: avoid test-after-deref of never-NULL pointer
X-Git-Tag: v0.8.2~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93fedcf20f64e02a97a9ab991e3ba3ebf1accbb7;p=thirdparty%2Flibvirt.git

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

* src/lxc/lxc_driver.c (lxcFreezeContainer): Remove test-after-deref.
Correct indentation in expression.
---

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index fc0df37e79..8c3bbd312e 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -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;
 }