changeset 23921:f368b91a542b

merge of '126251205c0faf12cb73ec60a10f1cf904b8166d' and 'e25c2c739ad8e544bc841cd6a8d7004ddd61a1a5'
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 27 Aug 2008 04:52:40 +0000
parents b8d38a11f9c6 (diff) 62387da2a57f (current diff)
children 519b877a59f5
files
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c	Wed Aug 27 03:06:44 2008 +0000
+++ b/libpurple/protocols/msn/notification.c	Wed Aug 27 04:52:40 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);