Mercurial > pidgin.yaz
changeset 30349:55913ed2a229
bonjour: Fix a crash-on-disconnect I introduced. Closes #11851
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 13 May 2010 21:01:34 +0000 |
| parents | d24cbd2c1e21 |
| children | cd857e9b7281 |
| files | ChangeLog libpurple/protocols/bonjour/jabber.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 13 13:29:24 2010 +0000 +++ b/ChangeLog Thu May 13 21:01:34 2010 +0000 @@ -1,6 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.7.1 (??/??/????): + Bonjour: + * Fix a crash on disconnect. + MSN: * Fix unnecessary bandwidth consumption for buddy icon requests when buddies have capital letters in their passport addresses.
--- a/libpurple/protocols/bonjour/jabber.c Thu May 13 13:29:24 2010 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Thu May 13 21:01:34 2010 +0000 @@ -1184,7 +1184,7 @@ buddies = purple_find_buddies(jdata->account, NULL); for (l = buddies; l; l = l->next) { BonjourBuddy *bb = purple_buddy_get_protocol_data((PurpleBuddy*) l->data); - if (bb != NULL) { + if (bb && bb->conversation) { /* Any ongoing connection attempt is cancelled * by _purple_connection_destroy */ bb->conversation->connect_data = NULL;