From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 1 Feb 2021 13:09:01 +0000 (+0100)
Subject: virsh: cmdSecretGetValue: Use virSecureErase instead of VIR_DISPOSE_N
X-Git-Tag: v7.1.0-rc1~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6195ed80c9fcf2705946499803fdfad7e744190;p=thirdparty%2Flibvirt.git

virsh: cmdSecretGetValue: Use virSecureErase instead of VIR_DISPOSE_N

Switch the secret value to 'g_autofree' for handling of the memory and
clear it out using virSecureErase.

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

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index e413af893f..de32f25d64 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -303,7 +303,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd)
 {
     g_autoptr(virshSecret) secret = NULL;
     VIR_AUTODISPOSE_STR base64 = NULL;
-    unsigned char *value;
+    g_autofree unsigned char *value = NULL;
     size_t value_size;
     bool plain = vshCommandOptBool(cmd, "plain");
 
@@ -315,7 +315,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd)
 
     if (plain) {
         if (fwrite(value, 1, value_size, stdout) != value_size) {
-            VIR_DISPOSE_N(value, value_size);
+            virSecureErase(value, value_size);
             vshError(ctl, "failed to write secret");
             return false;
         }
@@ -325,7 +325,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd)
         vshPrint(ctl, "%s", base64);
     }
 
-    VIR_DISPOSE_N(value, value_size);
+    virSecureErase(value, value_size);
     return true;
 }