pidgin.2.x.y: 5ca378b1: Fix crash when ignoring message from a u...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 5ca378b115ef36cfafb203fb88623734a7c6bb23
Parent:   55372aac7eca74e2a3121931b867702d2fdfe299
Author:   darkrain42 at pidgin.im
Date:     05/30/12 23:45:21
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/5ca378b115ef36cfafb203fb88623734a7c6bb23

Changelog: 

Fix crash when ignoring message from a user not in the room. Fixes #15139

Occurs with IRC system messages on-login.

Changes against parent 55372aac7eca74e2a3121931b867702d2fdfe299

  patched  ChangeLog
  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- ChangeLog	2ce1da10e89b5d92d55eb6e3ec17423f10e35913
+++ ChangeLog	424239f1d5d3dca41158404d442dfbe861d700a3
@@ -1,7 +1,9 @@ version 2.10.5:
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.10.5:
-	No changes
+	Pidgin:
+	* Fix a crash that may occur when trying to ignore a user who is
+	  not in the current chat room. (#15139)
 
 version 2.10.4 (05/06/2012):
 	General:
============================================================
--- pidgin/gtkconv.c	e181e2fec1b0326a8b0e30a543538e74375b4777
+++ pidgin/gtkconv.c	b665d6020646f30d031469ef595c7c2eabfb713d
@@ -6132,10 +6132,13 @@ static gboolean get_iter_from_chatbuddy(
 
 static gboolean get_iter_from_chatbuddy(PurpleConvChatBuddy *cb, GtkTreeIter *iter)
 {
-	GtkTreeRowReference *ref = cb->ui_data;
+	GtkTreeRowReference *ref;
 	GtkTreePath *path;
 	GtkTreeModel *model;
 
+	g_return_val_if_fail(cb != NULL, FALSE);
+
+	ref = cb->ui_data;
 	if (!ref)
 		return FALSE;
 
@@ -6315,6 +6318,9 @@ pidgin_conv_chat_update_user(PurpleConve
 		return;
 
 	cbuddy = purple_conv_chat_cb_find(chat, user);
+	if (!cbuddy)
+		return;
+
 	if (get_iter_from_chatbuddy(cbuddy, &iter)) {
 		GtkTreeRowReference *ref = cbuddy->ui_data;
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);