pidgin.2.4.3: 8d944930: applied changes from 904a276588f7de13ba1...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 8d9449301d20268c3e06b0bbfdb497946c9f70d1
Ancestor: 7cb95e6fdd08a36a70606214cb6c28ab3923de79
Author: datallah at pidgin.im
Date: 2008-06-19T03:11:47
Branch: im.pidgin.pidgin.2.4.3
URL: http://d.pidgin.im/viewmtn/revision/info/8d9449301d20268c3e06b0bbfdb497946c9f70d1

Modified files:
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c

ChangeLog: 

applied changes from 904a276588f7de13ba13b578905c82c0493184ce
             through 4dd6e06680aebbca6a326930f5fff7e65ed87802

-------------- next part --------------
============================================================
--- libpurple/protocols/irc/msgs.c	13ec164ae864a1248cefbd33c76b29da7a4f5419
+++ libpurple/protocols/irc/msgs.c	5cb77f0567315a4796fe1059a7bf58a1a9b27f16
@@ -122,7 +122,11 @@ void irc_msg_default(struct irc_conn *ir
 
 void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
-	purple_debug(PURPLE_DEBUG_INFO, "irc", "Unrecognized message: %s\n", args[0]);
+	char *clean;
+        /* This, too, should be escaped somehow (smarter) */
+        clean = purple_utf8_salvage(args[0]);
+	purple_debug(PURPLE_DEBUG_INFO, "irc", "Unrecognized message: %s\n", clean);
+        g_free(clean);
 }
 
 void irc_msg_features(struct irc_conn *irc, const char *name, const char *from, char **args)
============================================================
--- libpurple/protocols/irc/parse.c	ccfb71b737275b45901ffe4ebce726870d9a53d8
+++ libpurple/protocols/irc/parse.c	9ecd092b6d6fc9c3b0eaf79769c429a2e1508b61
@@ -710,5 +710,10 @@ static void irc_parse_error_cb(struct ir
 
 static void irc_parse_error_cb(struct irc_conn *irc, char *input)
 {
-	purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unrecognized string: %s\n", input);
+	char *clean;
+        /* This really should be escaped somehow that you can tell what
+         * the junk was -- but as it is, it can crash glib. */
+        clean = purple_utf8_salvage(input);
+	purple_debug(PURPLE_DEBUG_WARNING, "irc", "Unrecognized string: %s\n", clean);
+        g_free(clean);
 }