From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 10 Aug 2021 15:10:34 +0000 (+0200)
Subject: vsh: cmdEcho: use separate variable for argument
X-Git-Tag: v7.7.0-rc1~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78e2495e5eb6168da75eb866eb5cb8bd92ac0f5;p=thirdparty%2Flibvirt.git

vsh: cmdEcho: use separate variable for argument

Do not use 'arg' which is later used for an allocated string.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/tools/vsh.c b/tools/vsh.c
index 3bbaecd2ea..bf32a8dc22 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -3199,17 +3199,16 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd)
     while ((opt = vshCommandOptArgv(ctl, cmd, opt))) {
         char *str;
         g_auto(virBuffer) xmlbuf = VIR_BUFFER_INITIALIZER;
-
-        arg = opt->data;
+        const char *curr = opt->data;
 
         if (count)
             virBufferAddChar(&buf, ' ');
 
         if (xml) {
-            virBufferEscapeString(&xmlbuf, "%s", arg);
+            virBufferEscapeString(&xmlbuf, "%s", curr);
             str = virBufferContentAndReset(&xmlbuf);
         } else {
-            str = g_strdup(arg);
+            str = g_strdup(curr);
         }
 
         if (shell)