[Gaim-commits] SF.net SVN: gaim: [17443] trunk/console/gntblist.c

[<nos...@us...>]

Revision: 17443
          http://svn.sourceforge.net/gaim/?rev=17443&view=rev
Author:   nosnilmot
Date:     2006-10-07 10:25:21 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Fix Coverity CID 279 - Variable "name" tracked as NULL was passed to a
function that dereferences it. Groups can't be renamed to NULL anyway.

Modified Paths:
--------------
    trunk/console/gntblist.c

Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-10-07 17:21:31 UTC (rev 17442)
+++ trunk/console/gntblist.c	2006-10-07 17:25:21 UTC (rev 17443)
@@ -315,6 +315,7 @@
 			gaim_blist_add_group(grp, NULL);
 		}
 		gaim_blist_add_chat(chat, grp, NULL);
+		gaim_blist_alias_chat(chat, alias);
 	}
 }
 
@@ -833,7 +834,7 @@
 		serv_alias_buddy((GaimBuddy*)node);
 	} else if (GAIM_BLIST_NODE_IS_CHAT(node))
 		gaim_blist_alias_chat((GaimChat*)node, name);
-	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+	else if (GAIM_BLIST_NODE_IS_GROUP(node) && (name != NULL))
 		gaim_blist_rename_group((GaimGroup*)node, name);
 	else
 		g_return_if_reached();


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