From f6c2805b91161a01378c9bbe853521c08d460c60 Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Thu, 17 Mar 2016 22:27:05 +0100 Subject: [PATCH] Do not assume any default value for statusmsg. If the server didn't send it then just skip the check, the old value it defaulted to was possibly overlapping with the CHANTYPES leading to an incorrect behaviour. Fixes #435. --- src/irc/core/irc-servers.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 81f0c269..d6fb8018 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -81,12 +81,12 @@ static int ischannel_func(SERVER_REC *server, const char *data) chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes"); if (chantypes == NULL) chantypes = "#&!+"; /* normal, local, secure, modeless */ - statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); - if (statusmsg == NULL) - statusmsg = "@+"; - while (strchr(statusmsg, *data) != NULL) - data++; + statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); + if (statusmsg != NULL) { + while (strchr(statusmsg, *data) != NULL) + data++; + } return strchr(chantypes, *data) != NULL; }