merge of '115044245074f981ad10c03ef77cfb7e094a35fb'

Tue, 16 Dec 2008 02:25:08 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Tue, 16 Dec 2008 02:25:08 +0000
changeset 25196
34813ddd7169
parent 25195
115044245074 (current diff)
parent 25189
6901902cfca5 (diff)
child 25197
077b4d6fc595
child 25846
a93cb1380fae

merge of '115044245074f981ad10c03ef77cfb7e094a35fb'
and '6901902cfca5fdd46488e16bf5d23b5c0b4dae17'

--- a/libpurple/protocols/msn/nexus.c	Tue Dec 16 01:40:38 2008 +0000
+++ b/libpurple/protocols/msn/nexus.c	Tue Dec 16 02:25:08 2008 +0000
@@ -434,6 +434,9 @@
 #endif
 	char *decrypted_data;
 
+	if (resp == NULL)
+		return;
+
 	purple_debug_info("msn", "Got Update Response for %s.\n", ticket_domains[ud->id][SSO_VALID_TICKET_DOMAIN]);
 
 	enckey = xmlnode_get_child(resp->xml, "Header/Security/DerivedKeyToken");

mercurial