[Gaim-commits] SF.net SVN: gaim: [17813] trunk/libgaim/protocols/jabber/buddy.c

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

Revision: 17813
          http://svn.sourceforge.net/gaim/?rev=17813&view=rev
Author:   nosnilmot
Date:     2006-11-22 12:10:01 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Don't crash when getting info on someone on jabber with no resource name

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/buddy.c

Modified: trunk/libgaim/protocols/jabber/buddy.c
===================================================================
--- trunk/libgaim/protocols/jabber/buddy.c	2006-11-22 18:47:42 UTC (rev 17812)
+++ trunk/libgaim/protocols/jabber/buddy.c	2006-11-22 20:10:01 UTC (rev 17813)
@@ -602,7 +602,7 @@
 	GString *info_text;
 	char *resource_name;
 	JabberBuddyResource *jbr;
-	JabberBuddyInfoResource *jbir;
+	JabberBuddyInfoResource *jbir = NULL;
 	GList *resources;
 
 	/* not yet */
@@ -650,8 +650,9 @@
 			jbr = resources->data;
 			if(jbr->status)
 				purdy = gaim_strdup_withhtml(jbr->status);
-			g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
-					_("Resource"), jbr->name);
+			if(jbr->name)
+				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",
+						_("Resource"), jbr->name);
 			g_string_append_printf(info_text, "<b>%s:</b> %d<br/>",
 					_("Priority"), jbr->priority);
 			g_string_append_printf(info_text, "<b>%s:</b> %s%s%s<br/>",
@@ -661,7 +662,9 @@
 			if(purdy)
 				g_free(purdy);
 
-			jbir = g_hash_table_lookup(jbi->resources, jbr->name);
+			if(jbr->name)
+				jbir = g_hash_table_lookup(jbi->resources, jbr->name);
+
 			if(jbir) {
 				if(jbir->idle_seconds > 0) {
 					g_string_append_printf(info_text, "<b>%s:</b> %s<br/>",


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