[Gaim-commits] CVS: gaim/src/protocols/jabber presence.c,1.92,1.93

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

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21197/src/protocols/jabber

Modified Files:
	presence.c 
Log Message:
Resolve CID 94

Event var_compare_op: Added "msg" due to comparison "msg != 0"
627                     if(msg)
628                             *msg = gaim_status_get_attr_string(status, "message");
629     
630                     /* if the message is blank, then there really isn't a message */

Event var_deref_op: Variable "msg" tracked as NULL was dereferenced.
631                     if(*msg && !**msg)
632                             *msg = NULL;



Index: presence.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/presence.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -p -r1.92 -r1.93
--- presence.c	7 Mar 2006 08:19:07 -0000	1.92
+++ presence.c	13 Mar 2006 18:48:49 -0000	1.93
@@ -624,12 +624,13 @@ void gaim_status_to_jabber(const GaimSta
 			*state = jabber_buddy_status_id_get_state(status_id);
 		}
 
-		if(msg)
+		if(msg) {
 			*msg = gaim_status_get_attr_string(status, "message");
 
-		/* if the message is blank, then there really isn't a message */
-		if(*msg && !**msg)
-			*msg = NULL;
+			/* if the message is blank, then there really isn't a message */
+			if(*msg && !**msg)
+				*msg = NULL;
+		}
 
 		if(priority)
 			*priority = gaim_status_get_attr_int(status, "priority");