From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 27 Jul 2009 15:45:01 +0000 (+0100)
Subject: Fix crashes in Xen capabilities code
X-Git-Tag: v0.7.0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd6cd7dd630011afd6f6d1443b6ffe6cffb4561f;p=thirdparty%2Flibvirt.git

Fix crashes in Xen capabilities code

* src/xen_internal.c: Don't free memory now owned by the virCapsPtr
   structure
* tests/testutilsxen.c: Fix up for change in internal API
---

diff --git a/src/xen_internal.c b/src/xen_internal.c
index b75b1e8ec0..b6bf10d91a 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -2223,8 +2223,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
             virCapabilitiesFreeMachines(machines, 1);
             goto no_memory;
         }
-
-        virCapabilitiesFreeMachines(machines, 1);
+        machines = NULL;
 
         if (virCapabilitiesAddGuestDomain(guest,
                                           "xen",
diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 7685bd2cde..94c423f872 100644
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -9,6 +9,8 @@ virCapsPtr testXenCapsInit(void) {
     struct utsname utsname;
     virCapsPtr caps;
     virCapsGuestPtr guest;
+    virCapsGuestMachinePtr *machines;
+    int nmachines;
     static const char *const x86_machines[] = {
         "xenfv"
     };
@@ -21,10 +23,16 @@ virCapsPtr testXenCapsInit(void) {
                                    0, 0)) == NULL)
         return NULL;
 
+    nmachines = ARRAY_CARDINALITY(x86_machines);
+    if ((machines = virCapabilitiesAllocMachines(x86_machines, nmachines)) == NULL)
+        goto cleanup;
+
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", "i686", 32,
                                          "/usr/lib/xen/bin/qemu-dm", NULL,
-                                         1, x86_machines)) == NULL)
+                                         nmachines, machines)) == NULL)
         goto cleanup;
+    machines = NULL;
+
     if (virCapabilitiesAddGuestDomain(guest,
                                       "xen",
                                       NULL,
@@ -33,10 +41,16 @@ virCapsPtr testXenCapsInit(void) {
                                       NULL) == NULL)
         goto cleanup;
 
+    nmachines = ARRAY_CARDINALITY(xen_machines);
+    if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL)
+        goto cleanup;
+
     if ((guest = virCapabilitiesAddGuest(caps, "xen", "i686", 32,
                                          "/usr/lib/xen/bin/qemu-dm", NULL,
-                                         1, xen_machines)) == NULL)
+                                         nmachines, machines)) == NULL)
         goto cleanup;
+    machines = NULL;
+
     if (virCapabilitiesAddGuestDomain(guest,
                                       "xen",
                                       NULL,
@@ -48,6 +62,7 @@ virCapsPtr testXenCapsInit(void) {
     return caps;
 
 cleanup:
+    virCapabilitiesFreeMachines(machines, nmachines);
     virCapabilitiesFree(caps);
     return NULL;
 }