Mercurial > pidgin
view libpurple/protocols/msn/dialog.c @ 28844:ee1ed5d16235
Save the event source ID for search_find_cb so that it's removed when the
log dialog is closed. This fixes a double free which might be caused by
having a large logset (and maybe pressing Close multiple times).
It looks something like this, with a few variations:
== Invalid read of size 8
== at 0x483001: search_find_cb (gtklog.c:425)
== by 0xBB91E50: g_main_context_dispatch (gmain.c:1824)
== by 0xBB953E7: g_main_context_iterate (gmain.c:2455)
== by 0xBB958BC: g_main_loop_run (gmain.c:2663)
== by 0x63AF606: gtk_main (gtkmain.c:1205)
== by 0x485ADF: main (gtkmain.c:978)
== Address 0x1b469860 is 56 bytes inside a block of size 72 free'd
== at 0x4C239EF: free (vg_replace_malloc.c:323)
== by 0x483A6C: destroy_cb (gtklog.c:223)
== by 0xAB9B12C: g_closure_invoke (gclosure.c:767)
== by 0xABB02B1: signal_emit_unlocked_R (gsignal.c:3247)
== by 0xABB1806: g_signal_emit_valist (gsignal.c:2980)
== by 0xABB1CD2: g_signal_emit (gsignal.c:3037)
== by 0xAB9B12C: g_closure_invoke (gclosure.c:767)
== by 0xABB02B1: signal_emit_unlocked_R (gsignal.c:3247)
== by 0xABB1806: g_signal_emit_valist (gsignal.c:2980)
== by 0xABB1CD2: g_signal_emit (gsignal.c:3037)
== by 0x630ECB4: gtk_real_button_released (gtkbutton.c:1707)
== by 0xAB9B12C: g_closure_invoke (gclosure.c:767)
==
Fixes #11071.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Tue, 05 Jan 2010 06:43:18 +0000 |
parents | 5cdd93dac7a2 |
children | 8eb42d13cb3f |
line wrap: on
line source
/** * @file dialog.c Dialog functions * * purple * * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "dialog.h" typedef struct { PurpleConnection *gc; char *who; char *group; gboolean add; } MsnAddRemData; /* Remove the buddy referenced by the MsnAddRemData before the serverside list is changed. * If the buddy will be added, he'll be added back; if he will be removed, he won't be. */ /* Actually with our MSNP14 code that isn't true yet, he won't be added back :( */ static void msn_complete_sync_issue(MsnAddRemData *data) { PurpleBuddy *buddy; PurpleGroup *group = NULL; if (data->group != NULL) group = purple_find_group(data->group); if (group != NULL) buddy = purple_find_buddy_in_group(purple_connection_get_account(data->gc), data->who, group); else buddy = purple_find_buddy(purple_connection_get_account(data->gc), data->who); if (buddy != NULL) purple_blist_remove_buddy(buddy); } static void msn_add_cb(MsnAddRemData *data) { #if 0 /* this *should* be necessary !! */ msn_complete_sync_issue(data); #endif if (g_list_find(purple_connections_get_all(), data->gc) != NULL) { MsnSession *session = data->gc->proto_data; MsnUserList *userlist = session->userlist; msn_userlist_add_buddy(userlist, data->who, data->group); } g_free(data->group); g_free(data->who); g_free(data); } static void msn_rem_cb(MsnAddRemData *data) { msn_complete_sync_issue(data); if (g_list_find(purple_connections_get_all(), data->gc) != NULL) { MsnSession *session = data->gc->proto_data; MsnUserList *userlist = session->userlist; if (data->group == NULL) { msn_userlist_rem_buddy_from_list(userlist, data->who, MSN_LIST_FL); } else { g_free(data->group); } } g_free(data->who); g_free(data); } void msn_show_sync_issue(MsnSession *session, const char *passport, const char *group_name) { PurpleConnection *gc; PurpleAccount *account; MsnAddRemData *data; char *msg, *reason; account = session->account; gc = purple_account_get_connection(account); data = g_new0(MsnAddRemData, 1); data->who = g_strdup(passport); data->group = g_strdup(group_name); data->gc = gc; msg = g_strdup_printf(_("Buddy list synchronization issue in %s (%s)"), purple_account_get_username(account), purple_account_get_protocol_name(account)); if (group_name != NULL) { reason = g_strdup_printf(_("%s on the local list is " "inside the group \"%s\" but not on " "the server list. " "Do you want this buddy to be added?"), passport, group_name); } else { reason = g_strdup_printf(_("%s is on the local list but " "not on the server list. " "Do you want this buddy to be added?"), passport); } purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE, purple_connection_get_account(gc), data->who, NULL, data, 2, _("Yes"), G_CALLBACK(msn_add_cb), _("No"), G_CALLBACK(msn_rem_cb)); g_free(reason); g_free(msg); }