From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 2 Feb 2021 15:49:30 +0000 (+0100)
Subject: libxlMakeNetworkDiskSrc: Use virSecureEraseString instead of VIR_AUTODISPOSE_STR
X-Git-Tag: v7.1.0-rc1~311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffc13e76acc94957eb89d0ff22827856e9b07edf;p=thirdparty%2Flibvirt.git

libxlMakeNetworkDiskSrc: Use virSecureEraseString instead of VIR_AUTODISPOSE_STR

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 694192e1c3..de0fd66842 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -999,7 +999,7 @@ static int
 libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr)
 {
     virConnectPtr conn = NULL;
-    VIR_AUTODISPOSE_STR base64secret = NULL;
+    g_autofree char *base64secret = NULL;
     char *username = NULL;
     int ret = -1;
 
@@ -1022,7 +1022,10 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr)
         virSecureErase(secret, secretlen);
     }
 
-    if (!(*srcstr = libxlMakeNetworkDiskSrcStr(src, username, base64secret)))
+    *srcstr = libxlMakeNetworkDiskSrcStr(src, username, base64secret);
+    virSecureEraseString(base64secret);
+
+    if (!*srcstr)
         goto cleanup;
 
     ret = 0;