# HG changeset patch # User Daniel Atallah # Date 1193374376 0 # Node ID 8b74b226e02325872648c4da76fb2655ceb2c86f # Parent 0314cb293463c8ca2f29c0e5d1be745b595756de Fix a double-free that was not fun to track down. Fixes #3688. diff -r 0314cb293463 -r 8b74b226e023 libpurple/protocols/bonjour/jabber.c --- a/libpurple/protocols/bonjour/jabber.c Fri Oct 26 00:13:18 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Fri Oct 26 04:52:56 2007 +0000 @@ -367,7 +367,6 @@ void bonjour_jabber_stream_ended(PurpleBuddy *pb) { BonjourBuddy *bb = pb->proto_data; - PurpleConversation *conv; purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", pb->name); @@ -376,6 +375,7 @@ /* Inform the user that the conversation has been closed */ if (bb->conversation != NULL) { #if 0 + PurpleConversation *conv; conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, pb->account); if (conv != NULL) { char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name); diff -r 0314cb293463 -r 8b74b226e023 libpurple/protocols/bonjour/mdns_win32.c --- a/libpurple/protocols/bonjour/mdns_win32.c Fri Oct 26 00:13:18 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_win32.c Fri Oct 26 04:52:56 2007 +0000 @@ -150,7 +150,6 @@ g_slist_free(hosts); /* free the remaining args memory */ - purple_dnsquery_destroy(args->query); g_free(args->full_service_name); g_free(args); }