From 09ec46b675bc1a004b5edcffc0edc29e9d4db98f Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Thu, 3 Mar 2022 15:17:42 +0100 Subject: [PATCH] src/utils: really fix leaked groups and keys strings The prior approach did miss the g_auto(). Fixes 9f07e757 ("src/utils: fix leaked groups and keys strings") Now really fixes coverity issues: | CID 1445509 (#2 of 2): Resource leak (RESOURCE_LEAK) | 4. leaked_storage: Variable rem_groups going out of scope leaks the storage it points to | CID 1445498 (#2 of 2): Resource leak (RESOURCE_LEAK) | 5. leaked_storage: Variable rem_keys going out of scope leaks the storage it points to. Signed-off-by: Enrico Joerns --- src/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils.c b/src/utils.c index 154b1e5db..47bf8a6f7 100644 --- a/src/utils.c +++ b/src/utils.c @@ -155,7 +155,7 @@ gchar *resolve_path(const gchar *basefile, gchar *path) gboolean check_remaining_groups(GKeyFile *key_file, GError **error) { gsize rem_num_groups; - GStrv(rem_groups) = NULL; + g_auto(GStrv) rem_groups = NULL; rem_groups = g_key_file_get_groups(key_file, &rem_num_groups); if (rem_num_groups != 0) { @@ -170,7 +170,7 @@ gboolean check_remaining_groups(GKeyFile *key_file, GError **error) gboolean check_remaining_keys(GKeyFile *key_file, const gchar *groupname, GError **error) { gsize rem_num_keys; - GStrv(rem_keys) = NULL; + g_auto(GStrv) rem_keys = NULL; rem_keys = g_key_file_get_keys(key_file, groupname, &rem_num_keys, NULL); if (rem_keys && rem_num_keys != 0) {