pidgin: eed5cde2: jabber: Escape status messages with a '<...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Wed Aug 19 12:32:15 EDT 2009


-----------------------------------------------------------------
Revision: eed5cde2fba3fd49d2f5f4e1df8d25312fc34f61
Ancestor: e02ab47ee4103549b600fa72aad3495f6fdd7abd
Author: darkrain42 at pidgin.im
Date: 2009-08-19T16:21:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/eed5cde2fba3fd49d2f5f4e1df8d25312fc34f61

Modified files:
        ChangeLog libpurple/protocols/jabber/buddy.c

ChangeLog: 

jabber: Escape status messages with a '<' or '>' in the Get Info dialog.

Marcus pointed this out.

-------------- next part --------------
============================================================
--- ChangeLog	b3d1cf8f92200f91bc486adb7d2386295c615bfc
+++ ChangeLog	3e8e4f8ec5673df559be965a11c1df0eff2e520e
@@ -3,6 +3,7 @@ version 2.6.2 (??/??/2009):
 version 2.6.2 (??/??/2009):
 	XMPP:
 	* Prompt the user before cancelling a presence subscription.
+	* Escape status messages that have HTML entities in the Get Info dialog.
 
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
============================================================
--- libpurple/protocols/jabber/buddy.c	a47d14be8fed1d4285a911a4ed693477bc2526a1
+++ libpurple/protocols/jabber/buddy.c	4cfcb34fc77eba427d8df1dca407ee1477d277c7
@@ -749,7 +749,9 @@ add_jbr_info(JabberBuddyInfo *jbi, const
 		const char *status_name = jabber_buddy_state_get_name(jbr->state);
 
 		if (jbr->status) {
-			purdy = purple_strdup_withhtml(jbr->status);
+			tmp = purple_markup_escape_text(jbr->status, -1);
+			purdy = purple_strdup_withhtml(tmp);
+			g_free(tmp);
 
 			if (purple_strequal(status_name, purdy))
 				status_name = NULL;


More information about the Commits mailing list