Mercurial > pidgin.yaz
changeset 23925:fd0e8c6ffa4b
Path from Toby Schaffer to fix a null ptr deref when adding a buddy. Fixes #6821.
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2008 00:43:05 +0000 |
| parents | c1697251c9fe |
| children | 4a5c8feb83e6 |
| files | COPYRIGHT pidgin/gtkblist.c |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Wed Aug 27 16:45:04 2008 +0000 +++ b/COPYRIGHT Thu Aug 28 00:43:05 2008 +0000 @@ -354,6 +354,7 @@ Andrew Sayman Alceste Scalas Carsten Schaar +Toby Schaffer Jonathan Schleifer <js-pidgin@webkeks.org> Matteo Settenvini Colin Seymour
--- a/pidgin/gtkblist.c Wed Aug 27 16:45:04 2008 +0000 +++ b/pidgin/gtkblist.c Thu Aug 28 00:43:05 2008 +0000 @@ -6483,7 +6483,7 @@ purple_account_add_buddy(data->account, b); /* Offer to merge people with the same alias. */ - if (whoalias != NULL) + if (whoalias != NULL && g != NULL) gtk_blist_auto_personize((PurpleBlistNode *)g, whoalias); /*