[gaim-migrate @ 15872]

Mon, 13 Mar 2006 18:48:49 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Mon, 13 Mar 2006 18:48:49 +0000
changeset 13497
07fc0a9826b8
parent 13496
c1942626f106
child 13498
6a03aa3b5c1a

[gaim-migrate @ 15872]
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;

src/protocols/jabber/presence.c file | annotate | diff | comparison | revisions
--- a/src/protocols/jabber/presence.c	Mon Mar 13 18:31:21 2006 +0000
+++ b/src/protocols/jabber/presence.c	Mon Mar 13 18:48:49 2006 +0000
@@ -624,12 +624,13 @@
 			*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");

mercurial