From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 26 Jan 2021 16:12:50 +0000 (+0100)
Subject: vsh: Use g_auto(GStrv) to free string list returned by completer callback
X-Git-Tag: v7.1.0-rc1~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=268f16293c480919b34e53d102ae0751385e2c31;p=thirdparty%2Flibvirt.git

vsh: Use g_auto(GStrv) to free string list returned by completer callback

This saves us explicit call of g_strfreev() in error path.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
---

diff --git a/tools/vsh.c b/tools/vsh.c
index 3771ad50e9..bb8b90b08e 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -2778,9 +2778,9 @@ vshReadlineParse(const char *text, int state)
                 list = vshReadlineOptionsGenerator(text, cmd, partial);
 
             if (opt && opt->completer) {
-                char **completer_list = opt->completer(autoCompleteOpaque,
-                                                       partial,
-                                                       opt->completer_flags);
+                g_auto(GStrv) completer_list = opt->completer(autoCompleteOpaque,
+                                                              partial,
+                                                              opt->completer_flags);
 
                 /* Escape completions, if needed (i.e. argument
                  * we are completing wasn't started with a quote
@@ -2805,7 +2805,6 @@ vshReadlineParse(const char *text, int state)
                 if (completer_list &&
                     (vshCompleterFilter(&completer_list, text) < 0 ||
                      virStringListMerge(&list, &completer_list) < 0)) {
-                    g_strfreev(completer_list);
                     goto cleanup;
                 }
             }