# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1142275729 0
# Node ID d2aadcdbec6cb3db5409a0a69a8046f884245dc0
# Parent  8f299b9cd18437deb75720ab1d4077e137109032
[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;

committer: Tailor Script <tailor@pidgin.im>

diff -r 8f299b9cd184 -r d2aadcdbec6c src/protocols/jabber/presence.c
--- 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");