# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1141718552 0
# Node ID 5de8bf62b8efa1b453d7eaa563cf8d98abfb1bbc
# Parent  f3768fab10bd34301162bf497855096fb4c8ad52
[gaim-migrate @ 15817]
fix CID 74, and CID 37 (which could never happen, if I understand the code correctly)

committer: Tailor Script <tailor@pidgin.im>

diff -r f3768fab10bd -r 5de8bf62b8ef src/desktopitem.c
--- a/src/desktopitem.c	Tue Mar 07 07:55:42 2006 +0000
+++ b/src/desktopitem.c	Tue Mar 07 08:02:32 2006 +0000
@@ -723,7 +723,7 @@
 			char *p;
 			/* Whack C locale */
 			p = strchr (k, '[');
-			*p = '\0';
+			if(p) *p = '\0';
 			g_free (locale);
 		} else if (locale != NULL) {
 			char *p, *brace;
diff -r f3768fab10bd -r 5de8bf62b8ef src/protocols/jabber/presence.c
--- a/src/protocols/jabber/presence.c	Tue Mar 07 07:55:42 2006 +0000
+++ b/src/protocols/jabber/presence.c	Tue Mar 07 08:02:32 2006 +0000
@@ -609,12 +609,12 @@
 {
 	const char *status_id = NULL;
 
-	*state = JABBER_BUDDY_STATE_UNKNOWN;
-	*msg = NULL;
-	*priority = 0;
+	if(state) *state = JABBER_BUDDY_STATE_UNKNOWN;
+	if(msg) *msg = NULL;
+	if(priority) *priority = 0;
 
 	if(!status) {
-		*state = JABBER_BUDDY_STATE_UNAVAILABLE;
+		if(state) *state = JABBER_BUDDY_STATE_UNAVAILABLE;
 	} else {
 		if(state) {
 			status_id = gaim_status_get_id(status);
@@ -631,5 +631,4 @@
 		if(priority)
 			*priority = gaim_status_get_attr_int(status, "priority");
 	}
-
 }