# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1257360111 0
# Node ID cf9ea9f2c0bb792cf334ed9327794ed21fd82ff2
# Parent  4575d8daba129ad8f9e20286bc87d975dd056ae7# Parent  8464e695c62b675b05fc0d0b0b326a132f339631
merge of '06b53ea832679e0dfb2e6d5d0c1b69e61f1bd38b'
     and 'ea2f92f486297b27994d3652e14f799eb0964834'

diff -r 4575d8daba12 -r cf9ea9f2c0bb COPYRIGHT
--- a/COPYRIGHT	Wed Nov 04 05:09:04 2009 +0000
+++ b/COPYRIGHT	Wed Nov 04 18:41:51 2009 +0000
@@ -268,6 +268,7 @@
 Ambrose C. Li
 Nicolas Lichtmaier
 Wesley Lin
+Shaun Lindsay
 Artem Litvinovich
 Josh Littlefield
 Daniel Ljungborg
diff -r 4575d8daba12 -r cf9ea9f2c0bb ChangeLog
--- a/ChangeLog	Wed Nov 04 05:09:04 2009 +0000
+++ b/ChangeLog	Wed Nov 04 18:41:51 2009 +0000
@@ -1,3 +1,4 @@
+
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.6.4 (??/??/20??):
@@ -10,19 +11,22 @@
 	* Fix building the GnuTLS plugin with older versions of GnuTLS.
 	* Fix DNS TXT query resolution.
 	* Always rejoin open chats after an account reconnects.
-
 	AIM and ICQ:
 	* Better rate limit calculations and other improvements.  (Aman Gupta)
 	* More detailed error messages when messages fail to send.  (Aman Gupta)
 	* The simultaneous login account option is respected when using
 	  the clientLogin authentication method.
 
+
 	MSN:
 	* Don't forget display names for buddies.
 	* Fix a random crash that might occur when idle.
 	* Fix more FQY 240 connection errors.
 	* Fix a crash that could occur when adding a buddy.
 	* Fix an occasional crash when sending message to an offline user.
+	* Fix a random crash that might occur when idle.
+	* Fix a crash when logging in with some long non-ASCII passwords.
+	  (Shaun Lindsay)
 
 	XMPP:
 	* Users connecting to Google Talk now have an "Initiate Chat" context menu
@@ -30,10 +34,10 @@
 	* Fix a crash when attempting to validate an invalid JID.
 	* Resolve an issue when connecting to iChat Server when no resource
 	  is specified.
-	* Fix a crash when adding a buddy without an '@'.
 	* Try to automatically find a STUN server by using an SRV lookup on the
 	  account's domain, and use that for voice and video if found and the user 
 	  didn't set one manually in prefs.
+	* Fix a crash when adding a buddy without an '@'.
 
 	Yahoo:
 	* Fix sending /buzz.
@@ -52,12 +56,6 @@
 	* The userlist in a multiuser chat can be styled via gtkrc by using the
 	  widget name "pidgin_conv_userlist". (Heiko Schmitt)
 	* Add a hold button to the media window.
-	* Tooltips for custom smileys should work now.
-	* Users with unread messages are again bolded in the Buddy List.
-	* Minor reworking of the Preferences window's Network tab to make it need
-	  less vertical space.
-	* The global "Use remote DNS with SOCKS4 proxies" preference no longer
-	  disappears when the preference value changes in certain ways.
 
 version 2.6.3 (10/16/2009):
 	General:
diff -r 4575d8daba12 -r cf9ea9f2c0bb libpurple/protocols/msn/nexus.c
--- a/libpurple/protocols/msn/nexus.c	Wed Nov 04 05:09:04 2009 +0000
+++ b/libpurple/protocols/msn/nexus.c	Wed Nov 04 18:41:51 2009 +0000
@@ -399,7 +399,14 @@
 
 	username = purple_account_get_username(session->account);
 	password = purple_connection_get_password(session->account->gc);
-	password_xml = g_markup_escape_text(password, MIN(strlen(password), 16));
+	if (g_utf8_strlen(password, -1) > 16) {
+		/* max byte size for 16 utf8 characters is 64 + 1 for the null */
+		gchar truncated[65];
+		g_utf8_strncpy(truncated, password, 16);
+		password_xml = g_markup_escape_text(truncated, -1);
+	} else {
+		password_xml = g_markup_escape_text(password, -1);
+	}
 
 	purple_debug_info("msn", "Logging on %s, with policy '%s', nonce '%s'\n",
 	                  username, nexus->policy, nexus->nonce);