[Gaim-commits] CVS: gaim/src gtkconv.c,1.754,1.755

[Daniel A. <dat...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23252

Modified Files:
	gtkconv.c 
Log Message:
This fixes CID 92 (NULL dereferencing).

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -d -p -r1.754 -r1.755
--- gtkconv.c	7 Mar 2006 08:34:36 -0000	1.754
+++ gtkconv.c	8 Mar 2006 04:11:44 -0000	1.755
@@ -1589,7 +1589,7 @@ create_chat_menu(GaimConversation *conv,
 		g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
 	}
 
-	if (!is_me && !(prpl_info && prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
+	if (!is_me && prpl_info && !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
 		if (gaim_find_buddy(gc->account, who))
 			button = gaim_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
 						G_CALLBACK(menu_chat_add_remove_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);