pidgin: 2a1ff349: * Avoid called g_markup_escape_text() o...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 2a1ff3497bb7597ba3712218a7142bb6b167b2b4
Ancestor: 3311c78aec832cc7153f99b528561ad66d2fe6fc
Author: evands at pidgin.im
Date: 2008-06-09T18:43:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2a1ff3497bb7597ba3712218a7142bb6b167b2b4

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

 * Avoid called g_markup_escape_text() on a NULL message
 * If we get a NULL message and a non-NULL itms URL, pass "" for the message.
   Otherwise, the variable arguments will end at the message, and the itmsurl
   won't be seen.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	d6bb1da4537b057aca8a707287684cbe87929497
+++ libpurple/protocols/oscar/oscar.c	40824db06eb799eaa063b8631ead0d5a61ea3d65
@@ -1963,7 +1963,11 @@ static int purple_parse_oncoming(OscarDa
 			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
 					info->itmsurl, info->itmsurl_len);
 
-		tmp = g_markup_escape_text(message, -1);
+		tmp = (message ? g_markup_escape_text(message, -1) : NULL);
+
+		if (message == NULL && itmsurl != NULL)
+			message = "";
+
 		purple_prpl_got_user_status(account, info->sn, status_id,
 				"message", tmp, "itmsurl", itmsurl, NULL);
 		g_free(tmp);