From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 4 Jun 2021 13:06:34 +0000 (+0200)
Subject: chExtractVersion: use g_auto*
X-Git-Tag: v7.5.0-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4292d4b786f8634da1f00cd523acc26adce16835;p=thirdparty%2Flibvirt.git

chExtractVersion: use g_auto*

There are two variables that can be freed automatically: @cmd
(which allows us to drop explicit virCommandFree() call at the
end of the function) and @help which was never freed (and thus
leaked).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c
index b2812de7ad..c67c815d45 100644
--- a/src/ch/ch_conf.c
+++ b/src/ch/ch_conf.c
@@ -196,10 +196,10 @@ chExtractVersion(virCHDriver *driver)
 {
     int ret = -1;
     unsigned long version;
-    char *help = NULL;
+    g_autofree char *help = NULL;
     char *tmp = NULL;
     g_autofree char *ch_cmd = g_find_program_in_path(CH_CMD);
-    virCommand *cmd = NULL;
+    g_autoptr(virCommand) cmd = NULL;
 
     if (!ch_cmd)
         return -2;
@@ -236,6 +236,5 @@ chExtractVersion(virCHDriver *driver)
     ret = 0;
 
  cleanup:
-    virCommandFree(cmd);
     return ret;
 }