Fix a long-standing use-after-free in mainwin_actions_execute()

[claws.git] / src / action.c

diff --git a/src/action.c b/src/action.c
index 82850276524da20273ec180f724e74a336752bf3..b975f8e40b214c408643199b1be4fbb89d7d98b2 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -620,6 +620,13 @@ static void mainwin_actions_execute_cb(GtkWidget *widget, gpointer data)
        mainwin_actions_execute(mainwin, action_nb, NULL);
 }
 
+static void _free_msginfos(gpointer data, gpointer user_data)
+{
+       MsgInfo *msginfo = (MsgInfo *)data;
+
+       procmsg_msginfo_free(&msginfo);
+}
+
 static void mainwin_actions_execute(MainWindow *mainwin, guint action_nb,
                                       GtkWidget *widget)
 {
@@ -628,6 +635,7 @@ static void mainwin_actions_execute(MainWindow *mainwin, guint action_nb,
        msg_list = summary_get_selected_msg_list(mainwin->summaryview);
        message_actions_execute(mainwin->messageview, action_nb, msg_list);
        summary_select_by_msg_list(mainwin->summaryview, msg_list);
+       g_slist_foreach(msg_list, _free_msginfos, NULL);
        g_slist_free(msg_list);
 }