Changeset 94d52d64

Timestamp:

2007-12-02T11:00:15Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fc5d06d

Parents:

9ff5737

Message:

Added charset checks on incoming msgs (from the IRC side) to prevent possible
crashes/other odd behaviour in IM modules (or a GLib function that crashes on
non-UTF-8 strings).

File:

• irc.c (modified) (1 diff)

irc.c

@@ -320 +320 @@
                         }
                         
-                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        if( ( cs = set_getstr( &irc->set, "charset" ) ) )
                         {
                                 conv[IRC_MAX_LINE] = 0;
-                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
-                                        lines[i] = conv;
+                                if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
+                                {
+                                        if( irc->status & USTATUS_LOGGED_IN )
+                                                irc_usermsg( irc, "ERROR: Charset mismatch detected. The charset "
+                                                                  "setting is currently set to %s, so please make "
+                                                                  "sure your IRC client will send and accept text in "
+                                                                  "that charset, or tell BitlBee which charset to "
+                                                                  "expect by changing the charset setting. See "
+                                                                  "`help set charset' for more information. Your "
+                                                                  "message was ignored.", cs );
+                                        *conv = 0;
+                                }
+                                lines[i] = conv;
                         }