From: John Ferlan <jferlan@redhat.com>
Date: Thu, 5 Oct 2017 13:22:12 +0000 (-0400)
Subject: qemu: Add missing encinfo cleanup
X-Git-Tag: v3.9.0-rc1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a5ca62fbd332bd5f6a930e997f44d2d884ceff;p=thirdparty%2Flibvirt.git

qemu: Add missing encinfo cleanup

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>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8c36105895..ab243088df 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -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);
 }