pidgin: fe4da52a: Path from Toby Schaffer to fix a null pt...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: fe4da52ab77692f01273359f0b96a2c49d76fa99
Ancestor: 7088d38050c3c7bdc1b0ed09d3a330abfbfaa53d
Author: datallah at pidgin.im
Date: 2008-08-28T00:43:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fe4da52ab77692f01273359f0b96a2c49d76fa99

Modified files:
        COPYRIGHT pidgin/gtkblist.c

ChangeLog: 

Path from Toby Schaffer to fix a null ptr deref when adding a buddy. Fixes #6821.

-------------- next part --------------
============================================================
--- COPYRIGHT	161d62878f119ac6d60fc125546bc96d57c4625d
+++ COPYRIGHT	586ae7f517e5b9ab70a150e2281e0a471723b974
@@ -354,6 +354,7 @@ Carsten Schaar
 Andrew Sayman
 Alceste Scalas
 Carsten Schaar
+Toby Schaffer
 Jonathan Schleifer <js-pidgin at webkeks.org>
 Matteo Settenvini
 Colin Seymour
============================================================
--- pidgin/gtkblist.c	6d8b0c67ceb053487114b4efc8c004f703b9d0c2
+++ pidgin/gtkblist.c	d2e70e0953c260c210b76265c59b3f9512bfd9b6
@@ -6483,7 +6483,7 @@ add_buddy_cb(GtkWidget *w, int resp, Pid
 		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);
 
 		/*