From 94522bfdafad5e4d36bfadd65e626ca8540119fa Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Wed, 13 Mar 2019 20:54:20 +0100 Subject: [PATCH] Fix two small memory leaks in addressbook code In each case, the GList structure itself was not being freed. --- src/addrbook.c | 5 ++--- src/editgroup.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/addrbook.c b/src/addrbook.c index 808799635..296af5d23 100644 --- a/src/addrbook.c +++ b/src/addrbook.c @@ -1606,7 +1606,7 @@ static void addrbook_build_avail_email_vis(gpointer key, gpointer value, /** * Return link list of available email items that have not already been linked * to groups. Note that the list contains references to items and should be - * g_free() when done. Do *NOT* attempt to used the + * g_list_free() when done. Do *NOT* attempt to used the * addrbook_free_xxx() functions... this will destroy the * addressbook data! * @@ -1672,8 +1672,7 @@ void addrbook_update_group_list(AddressBookFile *book, ItemGroup *group, /* Remember old list */ oldData = group->listEMail; group->listEMail = listEMail; - mgu_clear_list(oldData); - oldData = NULL; + g_list_free(oldData); } /** diff --git a/src/editgroup.c b/src/editgroup.c index 22f16a8fc..6571296de 100644 --- a/src/editgroup.c +++ b/src/editgroup.c @@ -506,8 +506,7 @@ ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, Ite listEMail = addrbook_get_available_email_list( abf, group ); edit_group_load_clist( groupeditdlg.clist_avail, listEMail ); - mgu_clear_list( listEMail ); - listEMail = NULL; + g_list_free( listEMail ); gtk_cmclist_select_row( groupeditdlg.clist_group, 0, 0 ); gtk_cmclist_select_row( groupeditdlg.clist_avail, 0, 0 ); -- 2.25.1