From e60ff37f79dea291c43a2cc8b6132392e6c96c7c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 3 Feb 2023 15:53:31 +0100 Subject: [PATCH] cli: fix leaking "value" string in ask_option() Fixes: c5324ed285af ('nmcli: streamline connection addition') (cherry picked from commit ea3e61047f8e5010d3aac8d074f2b2a55952d2d1) --- src/nmcli/connections.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c index 00cc57acb..610248c86 100644 --- a/src/nmcli/connections.c +++ b/src/nmcli/connections.c @@ -5594,8 +5594,8 @@ next: static void ask_option(NmCli *nmc, NMConnection *connection, const NMMetaAbstractInfo *abstract_info) { - char *value; - GError *error = NULL; + gs_free char *value = NULL; + gs_free_error GError *error = NULL; gs_free char *prompt = NULL; gboolean multi; const char *setting_name, *property_name; @@ -5631,11 +5631,13 @@ ask_option(NmCli *nmc, NMConnection *connection, const NMMetaAbstractInfo *abstr g_print(_("You can specify this option more than once. Press when you're done.\n")); again: + nm_clear_g_free(&value); + g_clear_error(&error); + value = nmc_readline(&nmc->nmc_config, "%s", prompt); if (!set_option(nmc, connection, abstract_info, value, FALSE, &error)) { g_printerr("%s\n", error->message); - g_clear_error(&error); goto again; }