From a0602d0d2e8824394ba738a8677909b5c4676d95 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 11 Sep 2013 16:27:04 +0200 Subject: [PATCH] menu_removed_cb: fix 'name' leak https://bugzilla.gnome.org/show_bug.cgi?id=707885 --- src/empathy-roster-window.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 9dd7a4e7..667267f5 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -1360,16 +1360,22 @@ roster_window_favorite_chatroom_menu_removed_cb ( for (i = 0; i < n; i++) { - const gchar *name; + gchar *name; - if (g_menu_model_get_item_attribute ( - G_MENU_MODEL (self->priv->rooms_section), i, "room-name", - "s", &name) - && !tp_strdiff (name, empathy_chatroom_get_name (chatroom))) + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "room-name", "s", &name)) + continue; + + if (tp_strdiff (name, empathy_chatroom_get_name (chatroom))) { - g_menu_remove (self->priv->rooms_section, i); - break; + g_free (name); + continue; } + + g_menu_remove (self->priv->rooms_section, i); + g_free (name); + break; } chatrooms = empathy_chatroom_manager_get_chatrooms ( -- 2.39.2