]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
blockjob: fix memleak that prevented block pivot
authorEric Blake <eblake@redhat.com>
Fri, 21 Dec 2012 00:13:50 +0000 (17:13 -0700)
committerEric Blake <eblake@redhat.com>
Fri, 21 Dec 2012 19:43:49 +0000 (12:43 -0700)
https://bugzilla.redhat.com/show_bug.cgi?id=888426

The code for doing a block-copy was supposed to track the destination
file in drive->mirror, but was set up to do all mallocs prior to
starting the copy so that OOM wouldn't leave things partially started.
However, the wrong variable was being written; later in the code we
silently did 'disk->mirror = mirror' which was still NULL, and thus
leaking memory and leaving libvirt to think that the mirror job was
never started, which prevented a pivot operation after a copy.
Problem introduced in commit 35c7701c6.

* src/qemu/qemu_driver.c (qemuDomainBlockCopy): Initialize correct
variable.

src/qemu/qemu_driver.c

index 0058c8d72d47e9537dcff244d2fa24f09feb4d84..68f88cd407ae94119401aa647e5b89705ebb0ecd 100644 (file)
@@ -13429,7 +13429,7 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *path,
     }
     if (!format && disk->mirrorFormat > 0)
         format = virStorageFileFormatTypeToString(disk->mirrorFormat);
-    if (!(disk->mirror = strdup(dest))) {
+    if (!(mirror = strdup(dest))) {
         virReportOOMError();
         goto endjob;
     }