]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: fix blkio memory leak on failure
authorEric Blake <eblake@redhat.com>
Sat, 31 Dec 2011 23:32:35 +0000 (16:32 -0700)
committerEric Blake <eblake@redhat.com>
Sat, 31 Dec 2011 23:32:35 +0000 (16:32 -0700)
Leak detected by Coverity, and introduced in commit 93ab585.
Reported by Alex Jia.

* src/qemu/qemu_driver.c (qemuDomainSetBlkioParameters): Free
devices array on error.

src/qemu/qemu_driver.c

index fbaa824e90782d01d4b5fb88e7b2581784fe44cc..d89303ea19e32c1806c5de1c06a4b2c0c02b9c2a 100644 (file)
@@ -6012,11 +6012,8 @@ static int qemuDomainSetBlkioParameters(virDomainPtr dom,
                         break;
                     }
                 }
-                if (j != ndevices) {
-                    ret = -1;
-                    continue;
-                }
-                if (qemuDomainMergeDeviceWeights(&vm->def->blkio.devices,
+                if (j != ndevices ||
+                    qemuDomainMergeDeviceWeights(&vm->def->blkio.devices,
                                                  &vm->def->blkio.ndevices,
                                                  devices, ndevices) < 0)
                     ret = -1;