[gaim-migrate @ 16117]

Mon, 01 May 2006 20:47:11 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Mon, 01 May 2006 20:47:11 +0000
changeset 13715
8f5c82839d8f
parent 13714
babc08c1c499
child 13716
9c412f60a1ea

[gaim-migrate @ 16117]
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)

src/protocols/jabber/buddy.c file | annotate | diff | comparison | revisions
--- a/src/protocols/jabber/buddy.c	Mon May 01 20:43:46 2006 +0000
+++ b/src/protocols/jabber/buddy.c	Mon May 01 20:47:11 2006 +0000
@@ -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);

mercurial