Mercurial > pidgin
view libpurple/protocols/bonjour/buddy.c @ 22411:d9105ead88dc
When purple_buddy_icons_set_account_icon() is called, it unrefs the old PurpleStoredImage and refs the new one. Previously, it notified the prpl of the change in the buddy icon before updating pointer_icon_cache, which meant that if the prpl then called purple_buddy_icons_find_account_icon() it would get the old PurpleStoredImage (which is at this point not only old but also a pointer to invalid memory if unref'ing it caused it to be destroyed). This happens in jabber_set_info() as of 2.4.0, causing a crash when setting no-buddy-icon for an account after it has previously had an icon. I think this also means that XMPP accounts in 2.4.0 will also always set serverside the *last* icon set, not the current one, when changing icons, but I didn't test that.
The solution is simple: Update pointer_icon_cache earlier, setting the new img if there is one or removing the account entirely from the hash table if there isn't one now. This fixes both problems described above, making purple_buddy_icons_find_account_icon() return the new, current icon (or NULL) at all times.
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Tue, 04 Mar 2008 00:11:22 +0000 |
parents | 41959f031322 |
children | d50194ab3016 |
line wrap: on
line source
/* * 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 Library 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 <glib.h> #include <stdlib.h> #include "internal.h" #include "buddy.h" #include "account.h" #include "blist.h" #include "bonjour.h" #include "mdns_interface.h" #include "debug.h" /** * Creates a new buddy. */ BonjourBuddy * bonjour_buddy_new(const gchar *name, PurpleAccount* account) { BonjourBuddy *buddy = g_new0(BonjourBuddy, 1); buddy->account = account; buddy->name = g_strdup(name); _mdns_init_buddy(buddy); return buddy; } #define _B_CLR(x) g_free(x); x = NULL; void clear_bonjour_buddy_values(BonjourBuddy *buddy) { _B_CLR(buddy->first) _B_CLR(buddy->email); _B_CLR(buddy->ext); _B_CLR(buddy->jid); _B_CLR(buddy->last); _B_CLR(buddy->msg); _B_CLR(buddy->nick); _B_CLR(buddy->node); _B_CLR(buddy->phsh); _B_CLR(buddy->status); _B_CLR(buddy->vc); _B_CLR(buddy->ver); _B_CLR(buddy->AIM); } void set_bonjour_buddy_value(BonjourBuddy* buddy, const char *record_key, const char *value, guint32 len){ gchar **fld = NULL; g_return_if_fail(record_key != NULL); if (!strcmp(record_key, "1st")) fld = &buddy->first; else if(!strcmp(record_key, "email")) fld = &buddy->email; else if(!strcmp(record_key, "ext")) fld = &buddy->ext; else if(!strcmp(record_key, "jid")) fld = &buddy->jid; else if(!strcmp(record_key, "last")) fld = &buddy->last; else if(!strcmp(record_key, "msg")) fld = &buddy->msg; else if(!strcmp(record_key, "nick")) fld = &buddy->nick; else if(!strcmp(record_key, "node")) fld = &buddy->node; else if(!strcmp(record_key, "phsh")) fld = &buddy->phsh; else if(!strcmp(record_key, "status")) fld = &buddy->status; else if(!strcmp(record_key, "vc")) fld = &buddy->vc; else if(!strcmp(record_key, "ver")) fld = &buddy->ver; else if(!strcmp(record_key, "AIM")) fld = &buddy->AIM; if(fld == NULL) return; g_free(*fld); *fld = NULL; *fld = g_strndup(value, len); } /** * Check if all the compulsory buddy data is present. */ gboolean bonjour_buddy_check(BonjourBuddy *buddy) { if (buddy->account == NULL) return FALSE; if (buddy->name == NULL) return FALSE; return TRUE; } /** * If the buddy does not yet exist, then create it and add it to * our buddy list. In either case we set the correct status for * the buddy. */ void bonjour_buddy_add_to_purple(BonjourBuddy *bonjour_buddy, PurpleBuddy *buddy) { PurpleGroup *group; PurpleAccount *account = bonjour_buddy->account; const char *status_id, *old_hash, *new_hash; /* Translate between the Bonjour status and the Purple status */ if (bonjour_buddy->status != NULL && g_ascii_strcasecmp("dnd", bonjour_buddy->status) == 0) status_id = BONJOUR_STATUS_ID_AWAY; else status_id = BONJOUR_STATUS_ID_AVAILABLE; /* * TODO: Figure out the idle time by getting the "away" * field from the DNS SD. */ /* Make sure the Bonjour group exists in our buddy list */ group = purple_find_group(BONJOUR_GROUP_NAME); /* Use the buddy's domain, instead? */ if (group == NULL) { group = purple_group_new(BONJOUR_GROUP_NAME); purple_blist_add_group(group, NULL); } /* Make sure the buddy exists in our buddy list */ if (buddy == NULL) buddy = purple_find_buddy(account, bonjour_buddy->name); if (buddy == NULL) { buddy = purple_buddy_new(account, bonjour_buddy->name, NULL); buddy->proto_data = bonjour_buddy; purple_blist_node_set_flags((PurpleBlistNode *)buddy, PURPLE_BLIST_NODE_FLAG_NO_SAVE); purple_blist_add_buddy(buddy, NULL, group, NULL); } /* Create the alias for the buddy using the first and the last name */ if (bonjour_buddy->nick) serv_got_alias(purple_account_get_connection(account), buddy->name, bonjour_buddy->nick); else { gchar *alias = NULL; const char *first, *last; first = bonjour_buddy->first; last = bonjour_buddy->last; if ((first && *first) || (last && *last)) alias = g_strdup_printf("%s%s%s", (first && *first ? first : ""), (first && *first && last && *last ? " " : ""), (last && *last ? last : "")); serv_got_alias(purple_account_get_connection(account), buddy->name, alias); g_free(alias); } /* Set the user's status */ if (bonjour_buddy->msg != NULL) purple_prpl_got_user_status(account, buddy->name, status_id, "message", bonjour_buddy->msg, NULL); else purple_prpl_got_user_status(account, buddy->name, status_id, NULL); purple_prpl_got_user_idle(account, buddy->name, FALSE, 0); /* TODO: Because we don't save Bonjour buddies in blist.xml, * we will always have to look up the buddy icon at login time. * I think we should figure out a way to do something about this. */ /* Deal with the buddy icon */ old_hash = purple_buddy_icons_get_checksum_for_user(buddy); new_hash = (bonjour_buddy->phsh && *(bonjour_buddy->phsh)) ? bonjour_buddy->phsh : NULL; if (new_hash && (!old_hash || strcmp(old_hash, new_hash) != 0)) { /* Look up the new icon data */ /* TODO: Make sure the hash assigned to the retrieved buddy icon is the same * as what we looked up. */ bonjour_dns_sd_retrieve_buddy_icon(bonjour_buddy); } else if (!new_hash) purple_buddy_icons_set_for_user(account, buddy->name, NULL, 0, NULL); } /** * We got the buddy icon data; deal with it */ void bonjour_buddy_got_buddy_icon(BonjourBuddy *buddy, gconstpointer data, gsize len) { /* Recalculate the hash instead of using the current phsh to make sure it is accurate for the icon. */ char *p, *hash; if (data == NULL || len == 0) return; /* Take advantage of the fact that we use a SHA-1 hash of the data as the filename. */ hash = purple_util_get_image_filename(data, len); /* Get rid of the extension */ if (!(p = strchr(hash, '.'))) { g_free(hash); return; } *p = '\0'; purple_debug_info("bonjour", "Got buddy icon for %s icon hash='%s' phsh='%s'.\n", buddy->name, hash, buddy->phsh ? buddy->phsh : "(null)"); purple_buddy_icons_set_for_user(buddy->account, buddy->name, g_memdup(data, len), len, hash); g_free(hash); } /** * Deletes a buddy from memory. */ void bonjour_buddy_delete(BonjourBuddy *buddy) { g_free(buddy->name); while (buddy->ips != NULL) { g_free(buddy->ips->data); buddy->ips = g_slist_delete_link(buddy->ips, buddy->ips); } g_free(buddy->first); g_free(buddy->phsh); g_free(buddy->status); g_free(buddy->email); g_free(buddy->last); g_free(buddy->jid); g_free(buddy->AIM); g_free(buddy->vc); g_free(buddy->msg); g_free(buddy->ext); g_free(buddy->nick); g_free(buddy->node); g_free(buddy->ver); bonjour_jabber_close_conversation(buddy->conversation); buddy->conversation = NULL; /* Clean up any mdns implementation data */ _mdns_delete_buddy(buddy); g_free(buddy); }