changeset 23993:519b877a59f5

merge of '153989e7ae76bd6d5247eca35699948dded65121' and '1ef58f8d4eed57be3447aa663ae1d2e32d74ce29'
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 27 Aug 2008 04:53:35 +0000
parents 4a1bbe955690 (current diff) f368b91a542b (diff)
children c1697251c9fe f89bdd34c9f1
files
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c	Wed Aug 27 04:05:10 2008 +0000
+++ b/libpurple/protocols/msn/notification.c	Wed Aug 27 04:53:35 2008 +0000
@@ -1509,6 +1509,13 @@
 
 	passport = cmd->params[0];
 	user = msn_userlist_find_user(session->userlist, passport);
+	if (user == NULL) {
+		char *str = g_strndup(payload, len);
+		purple_debug_info("msn", "unknown user %s, payload is %s",
+			passport, str);
+		g_free(str);
+		return;
+	}
 
 	psm_str = msn_get_psm(cmd->payload,len);
 	msn_user_set_statusline(user, psm_str);