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

[<rl...@us...>]

Revision: 16117
Author:   rlaager
Date:     2006-05-01 13:47:11 -0700 (Mon, 01 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16117&view=rev

Log Message:
-----------
Resolve CID 134

Event deref_ptr_in_call: Dereferences pointer "gc"
491  		account = gaim_connection_get_account(gc);

Event check_after_deref: Pointer "gc" dereferenced before NULL check
496  			if (gc != NULL)

Modified Paths:
--------------
    trunk/src/protocols/jabber/buddy.c
Modified: trunk/src/protocols/jabber/buddy.c
===================================================================
--- trunk/src/protocols/jabber/buddy.c	2006-05-01 20:43:46 UTC (rev 16116)
+++ trunk/src/protocols/jabber/buddy.c	2006-05-01 20:47:11 UTC (rev 16117)
@@ -450,7 +450,6 @@
 static void
 jabber_format_info(GaimConnection *gc, GaimRequestFields *fields)
 {
-	GaimAccount *account;
 	xmlnode *vc_node;
 	GaimRequestField *field;
 	const char *text;
@@ -488,13 +487,13 @@
 	p = xmlnode_to_str(vc_node, NULL);
 	xmlnode_free(vc_node);
 
-	account = gaim_connection_get_account(gc);
+	if (gc != NULL) {
+		GaimAccount *account = gaim_connection_get_account(gc);
 
-	if (account != NULL) {
-		gaim_account_set_user_info(account, p);
-
-		if (gc != NULL)
+		if (account != NULL) {
+			gaim_account_set_user_info(account, p);
 			serv_set_info(gc, p);
+		}
 	}
 
 	g_free(p);


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