Mercurial > pidgin
changeset 20364:4293673c1f37
applied changes from 8e81ccec879f9cfbd8fc282b703803c98e150ff7
through 3bee1aee40b5389caacd65f686618708d5bc65c8
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 21 Oct 2007 05:05:38 +0000 |
| parents | 845226dc3f40 |
| children | 9401a46da958 |
| files | libpurple/protocols/myspace/myspace.c libpurple/protocols/myspace/user.c libpurple/protocols/myspace/user.h |
| diffstat | 3 files changed, 25 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c Sun Oct 21 05:04:44 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Sun Oct 21 05:05:38 2007 +0000 @@ -933,7 +933,6 @@ gchar *username; PurpleNotifyUserInfo *user_info; MsimUser *user; - gboolean temporary_user; g_return_if_fail(MSIM_SESSION_VALID(session)); @@ -955,10 +954,14 @@ if (!user) { /* User isn't on blist, create a temporary user to store info. */ - temporary_user = TRUE; + PurpleBuddy *buddy; + user = g_new0(MsimUser, 1); - } else { - temporary_user = FALSE; + user->temporary_user = TRUE; + + buddy = purple_buddy_new(session->account, username, NULL); + user->buddy = buddy; + buddy->proto_data = (gpointer)user; } /* Update user structure with new information */ @@ -974,7 +977,8 @@ purple_notify_user_info_destroy(user_info); - if (temporary_user) { + if (user->temporary_user) { + purple_blist_remove_buddy(user->buddy); g_free(user->client_info); g_free(user->gender); g_free(user->location); @@ -1450,7 +1454,7 @@ purple_debug_info("msim", "data=%s\n", data->str ? data->str : "(NULL)"); - /* url_text is variable=data\n... */ + /* url_text is variable=data\n...†*/ /* Check FILEVER, 1.0.716.0. 716 is build, MSIM_CLIENT_VERSION */ /* New (english) version can be downloaded from SETUPURL+SETUPFILE */
--- a/libpurple/protocols/myspace/user.c Sun Oct 21 05:04:44 2007 +0000 +++ b/libpurple/protocols/myspace/user.c Sun Oct 21 05:05:38 2007 +0000 @@ -99,10 +99,12 @@ if (full) { /* TODO: link to username, if available */ - char *profile = g_strdup_printf("<a href=\"http://myspace.com/%d\">http://myspace.com/%d</a>", - uid, uid); - purple_notify_user_info_add_pair(user_info, _("Profile"), profile); - g_free(profile); + if (uid) { + char *profile = g_strdup_printf("<a href=\"http://myspace.com/%d\">http://myspace.com/%d</a>", + uid, uid); + purple_notify_user_info_add_pair(user_info, _("Profile"), profile); + g_free(profile); + } } @@ -189,6 +191,14 @@ /* Ignore because PurpleBuddy knows this already */ ; } else if (g_str_equal(key_str, "ImageURL") || g_str_equal(key_str, "AvatarURL")) { + if (user->temporary_user) { + /* This user will be destroyed soon; don't try to look up its image or avatar, + * since that won't return immediately and we will end up accessing freed data. + */ + g_free(value_str); + return; + } + const gchar *previous_url; user->image_url = g_strdup(value_str);
--- a/libpurple/protocols/myspace/user.h Sun Oct 21 05:04:44 2007 +0000 +++ b/libpurple/protocols/myspace/user.h Sun Oct 21 05:05:38 2007 +0000 @@ -38,6 +38,7 @@ gchar *band_name, *song_name; gchar *image_url; guint last_image_updated; + gboolean temporary_user; } MsimUser; /* Callback function pointer type for when a user's information is received,