[Gaim-commits] SF.net SVN: gaim: [16432] trunk/src/gtkblist.c

[<aar...@us...>]

Revision: 16432
Author:   aaronsheldon
Date:     2006-07-05 10:41:37 -0700 (Wed, 05 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16432&view=rev

Log Message:
-----------
Fixes potential segfaults.

Modified Paths:
--------------
    trunk/src/gtkblist.c
Modified: trunk/src/gtkblist.c
===================================================================
--- trunk/src/gtkblist.c	2006-07-05 00:42:58 UTC (rev 16431)
+++ trunk/src/gtkblist.c	2006-07-05 17:41:37 UTC (rev 16432)
@@ -4106,14 +4106,16 @@
 	gboolean show = FALSE;
 	GaimBlistNode* gnode;
 
+	g_return_if_fail(node != NULL);
 
 	if (GAIM_BLIST_NODE_IS_GROUP(node))
 		gnode = node;
-	else if (GAIM_BLIST_NODE_IS_BUDDY(node)) /* maybe OR'ed with IS_CHAT? */
+	else if (GAIM_BLIST_NODE_IS_BUDDY(node) || GAIM_BLIST_NODE_IS_CHAT(node))
 		gnode = node->parent->parent;
 	else if (GAIM_BLIST_NODE_IS_CONTACT(node))
 		gnode = node->parent;
-	g_return_if_fail(GAIM_BLIST_NODE_IS_GROUP(gnode));
+	else
+		return;
 
 	group = (GaimGroup*)gnode;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.