[gaim-migrate @ 15870]

Mon, 13 Mar 2006 17:58:43 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Mon, 13 Mar 2006 17:58:43 +0000
changeset 13495
6f0da8ad9bcc
parent 13494
413c793bd39f
child 13496
c1942626f106

[gaim-migrate @ 15870]
Resolves CID 92

Event var_compare_op: Added "gc" due to comparison "gc != 0"
1633 if (gc != NULL)
1634 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);

Event var_deref_model: Variable "gc" tracked as NULL was passed to a function that dereferences it. [model]
1641 menu = create_chat_menu (conv, who, prpl_info, gc);

src/gtkconv.c file | annotate | diff | comparison | revisions
--- a/src/gtkconv.c	Mon Mar 13 17:57:34 2006 +0000
+++ b/src/gtkconv.c	Mon Mar 13 17:58:43 2006 +0000
@@ -1628,10 +1628,11 @@
 	account = gaim_conversation_get_account(conv);
 	gc      = account->gc;
 
+	g_return_if_fail(gc != NULL);
+
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
 
-	if (gc != NULL)
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkchat->list));
 	if(!gtk_tree_selection_get_selected(sel, NULL, &iter))

mercurial