# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1219884185 0
# Node ID fd0e8c6ffa4b9f067deb4664f793bc7bc03b238f
# Parent  c1697251c9fe77f180f6fea50ae552ee51e83ddb
Path from Toby Schaffer to fix a null ptr deref when adding a buddy. Fixes #6821.

diff -r c1697251c9fe -r fd0e8c6ffa4b COPYRIGHT
--- 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
diff -r c1697251c9fe -r fd0e8c6ffa4b pidgin/gtkblist.c
--- 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);
 
 		/*