]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Add missing encinfo cleanup
authorJohn Ferlan <jferlan@redhat.com>
Thu, 5 Oct 2017 13:22:12 +0000 (09:22 -0400)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 19 Oct 2017 16:20:30 +0000 (18:20 +0200)
When commit id 'da86c6c22' added support for diskPriv->encinfo in
qemuDomainSecretDiskPrepare a change to qemuDomainSecretDiskDestroy
to was missed. Although qemuDomainDiskPrivateDispose probably would
do the trick.

Signed-off-by: John Ferlan <jferlan@redhat.com>
src/qemu/qemu_domain.c

index 8c361058957eae92d1c0818d9d3d1bcfa77ec4de..ab243088df17a13301f568033903ec217e881bc4 100644 (file)
@@ -1302,10 +1302,11 @@ qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk)
 {
     qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
 
-    if (!diskPriv || !diskPriv->secinfo)
-        return;
+    if (diskPriv && diskPriv->secinfo)
+        qemuDomainSecretInfoFree(&diskPriv->secinfo);
 
-    qemuDomainSecretInfoFree(&diskPriv->secinfo);
+    if (diskPriv && diskPriv->encinfo)
+        qemuDomainSecretInfoFree(&diskPriv->encinfo);
 }