From 33b306eaaa3e05cbc5d196d0d2f0b741ff11a9e6 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 7 Apr 2010 03:27:55 +0100 Subject: Don't allow non-8-bit character sets like utf-16 which completely break the IRC protocol. (Happened to at least two public server users by now and it renders the accounts useless without manual intervention.) --- irc.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index b33a483b..8cd4a33a 100644 --- a/irc.c +++ b/irc.c @@ -51,18 +51,29 @@ static char *set_eval_password( set_t *set, char *value ) static char *set_eval_charset( set_t *set, char *value ) { irc_t *irc = set->data; + char *test; + gsize test_bytes = 0; GIConv ic, oc; if( g_strcasecmp( value, "none" ) == 0 ) value = g_strdup( "utf-8" ); - if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 ) + if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 ) { return NULL; } - if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 ) + if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL || + test_bytes > 1 ) + { + g_free( test ); + g_iconv_close( oc ); + irc_usermsg( irc, "Unsupported character set: The IRC protocol " + "only supports 8-bit character sets." ); + return NULL; + } + if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 ) { - g_iconv_close( ic ); + g_iconv_close( oc ); return NULL; } -- cgit v1.2.3 From 3e5766022e8103765d62343956cf1aeba34b4d82 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Wed, 7 Apr 2010 04:59:01 +0100 Subject: Show timestamps for offline messages. Including a timezone setting for people using servers outside their own timezone. --- irc.c | 1 + 1 file changed, 1 insertion(+) (limited to 'irc.c') diff --git a/irc.c b/irc.c index 8cd4a33a..b68c5adb 100644 --- a/irc.c +++ b/irc.c @@ -198,6 +198,7 @@ irc_t *irc_new( int fd ) s = set_add( &irc->set, "status", NULL, set_eval_away_status, irc ); s->flags |= SET_NULL_OK; s = set_add( &irc->set, "strip_html", "true", NULL, irc ); + s = set_add( &irc->set, "timezone", "local", set_eval_timezone, irc ); s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc ); s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc ); -- cgit v1.2.3 From 5b9b2b6413d66df01a866205af489eca9f8ea308 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 8 Apr 2010 01:55:17 +0100 Subject: Added display_timestamps setting in case some people may not really like them. --- irc.c | 1 + 1 file changed, 1 insertion(+) (limited to 'irc.c') diff --git a/irc.c b/irc.c index b68c5adb..28fee69d 100644 --- a/irc.c +++ b/irc.c @@ -185,6 +185,7 @@ irc_t *irc_new( int fd ) s = set_add( &irc->set, "debug", "false", set_eval_bool, irc ); s = set_add( &irc->set, "default_target", "root", NULL, irc ); s = set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc ); + s = set_add( &irc->set, "display_timestamps", "true", set_eval_bool, irc ); s = set_add( &irc->set, "handle_unknown", "root", NULL, irc ); s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc ); s = set_add( &irc->set, "ops", "both", set_eval_ops, irc ); -- cgit v1.2.3 From 92a9c686a1d2f5f98bfaed97333c9e856ec70166 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 8 Apr 2010 22:56:27 +0100 Subject: Fixed 2-byte memory leak in set_eval_charset(). --- irc.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'irc.c') diff --git a/irc.c b/irc.c index 28fee69d..aa8bc140 100644 --- a/irc.c +++ b/irc.c @@ -62,6 +62,9 @@ static char *set_eval_charset( set_t *set, char *value ) { return NULL; } + + /* Do a test iconv to see if the user picked an IRC-compatible + charset (for example utf-16 goes *horribly* wrong). */ if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL || test_bytes > 1 ) { @@ -71,6 +74,8 @@ static char *set_eval_charset( set_t *set, char *value ) "only supports 8-bit character sets." ); return NULL; } + g_free( test ); + if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 ) { g_iconv_close( oc ); -- cgit v1.2.3