# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1219812815 0
# Node ID 519b877a59f5bfd458cb5430119504aa57a49bd7
# Parent  4a1bbe9556904660218fea6f175d1c07560f8fdb# Parent  f368b91a542b59cd9a0961906b7c1d53e3fcfda5
merge of '153989e7ae76bd6d5247eca35699948dded65121'
     and '1ef58f8d4eed57be3447aa663ae1d2e32d74ce29'

diff -r 4a1bbe955690 -r 519b877a59f5 libpurple/protocols/msn/notification.c
--- 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);