pidgin: ce732522: Fix a segfault when deleting an account ...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: ce7325225416ec95baeeda78efa250ccc0c8dc87
Ancestor: 27a5e4c3bf4db89f9d87c37d7043c1f4dc68ed1f
Author: paul at darkrain42.org
Date: 2009-01-20T02:33:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ce7325225416ec95baeeda78efa250ccc0c8dc87

Modified files:
        ChangeLog libpurple/blist.c

ChangeLog: 

Fix a segfault when deleting an account without an associated prpl. Reported by adi1 in #pidgin.

Fixes #8180.

-------------- next part --------------
============================================================
--- ChangeLog	1ccf818568a6da6d2a969a75a2fcafc28ee86cf2
+++ ChangeLog	1d10835bc2905a016cb9ffe1ed7a066d64a88148
@@ -1,6 +1,9 @@ version 2.5.5 (??/??/????):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.5.5 (??/??/????):
+	libpurple:
+	* Fix a crash when removing an account with an unknown protocol id.
+
 	Finch:
 	* Allow rebinding keys to change the focused widget (details in the
 	  man-page, look for GntBox::binding)
============================================================
--- libpurple/blist.c	fa7ccb5d88f66b272a2664e86da870d6991381d2
+++ libpurple/blist.c	2705b8eabf29267ee167ddcb5bc9427d1df8590c
@@ -1811,7 +1811,7 @@ void purple_blist_remove_buddy(PurpleBud
 	PurpleGroup *group;
 	struct _purple_hbuddy hb;
 	PurplePlugin *prpl;
-	PurplePluginProtocolInfo *prpl_info;
+	PurplePluginProtocolInfo *prpl_info = NULL;
 
 	g_return_if_fail(buddy != NULL);
 
@@ -1872,7 +1872,8 @@ void purple_blist_remove_buddy(PurpleBud
 	 * can free proto_data
 	 */
 	prpl = purple_find_prpl(purple_account_get_protocol_id(buddy->account));
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+	if (prpl)
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 	if (prpl_info && prpl_info->buddy_free)
 		prpl_info->buddy_free(buddy);