From 39e05c23687b9af2cac6fc982b2f90aadb2a9c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Sat, 19 Dec 2020 15:11:43 +0000 Subject: list-view: Don't leak container array When converting the array into a list, the list takes the data. But the original container is leaked. Get the array inside the helper function and free it after its data is taken. Also rename the helper funcion appropriately. --- src/nautilus-list-view.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index a4fabb924..0bfb7dec4 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -2468,10 +2468,13 @@ get_default_visible_columns (NautilusListView *list_view) } static GList * -default_column_array_as_list (gchar **array) +get_default_visible_columns_as_list (NautilusListView *list_view) { GList *res = NULL; gint i = 0; + gchar **array; + + array = get_default_visible_columns (list_view); while (array[i] != NULL) { @@ -2479,6 +2482,8 @@ default_column_array_as_list (gchar **array) i++; } + g_free (array); + return res; } @@ -2506,7 +2511,7 @@ get_visible_columns (NautilusListView *list_view) NAUTILUS_METADATA_KEY_LIST_VIEW_VISIBLE_COLUMNS); if (visible_columns == NULL) { - visible_columns = default_column_array_as_list (get_default_visible_columns (list_view)); + visible_columns = get_default_visible_columns_as_list (list_view); } res = g_ptr_array_new (); -- cgit v1.2.1