Mercurial > pidgin

diff libpurple/protocols/msn/nexus.c @ 20531:a96b5015395a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
signs on!
author Ka-Hing Cheung <khc@hxbc.us>
date Mon, 01 Oct 2007 00:29:44 +0000
parents 719ce4acfcb9
children 10d27a4be2fd
line wrap: on
line diff
--- a/libpurple/protocols/msn/nexus.c	Fri Sep 28 05:51:49 2007 +0000
+++ b/libpurple/protocols/msn/nexus.c	Mon Oct 01 00:29:44 2007 +0000
@@ -57,7 +57,6 @@
 	if (nexus->challenge_data != NULL)
 		g_hash_table_destroy(nexus->challenge_data);
 
-	//msn_soap_destroy(nexus->soapconn);
 	g_free(nexus);
 }
 
@@ -160,10 +159,13 @@
 			"RequestedSecurityToken/BinarySecurityToken");
 
 		if (token) {
+			char *token_str = xmlnode_get_data(token);
 			char **elems, **cur, **tokens;
 			char *msn_twn_t, *msn_twn_p, *cert_str;
 
-			elems = g_strsplit(token->data, "&amp;", 0);
+			if (token_str == NULL) continue;
+
+			elems = g_strsplit(token_str, "&", 0);
 
 			for (cur = elems; *cur != NULL; cur++){
 				tokens = g_strsplit(*cur, "=", 2);
@@ -172,6 +174,7 @@
 				g_free(tokens);
 			}
 
+			g_free(token_str);
 			g_strfreev(elems);
 
 			msn_twn_t = g_hash_table_lookup(nexus->challenge_data, "t");
@@ -198,6 +201,10 @@
 			return;
 		}
 	}
+
+	/* we must have failed! */
+	msn_session_set_error(session, MSN_ERROR_AUTH, _("Windows Live ID authentication: cannot find authenticate token in server response"));
+
 }
 #if 0
 /*process the SOAP reply, get the Authentication Info*/