jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #442 from LemonBoy/fix-435

Browse Source 
Do not assume any default value for statusmsg.
This commit is contained in:
ailin-nemui 2016-03-20 22:06:41 +01:00
parent 15296a0165
commit fe600dd5dc
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/irc/core/irc-servers.c
View File

@ -78,17 +78,23 @@ static int ischannel_func(SERVER_REC *server, const char *data)
IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server; IRC_SERVER_REC *irc_server = (IRC_SERVER_REC *) server;
char *chantypes, *statusmsg; char *chantypes, *statusmsg;
g_return_val_if_fail(data != NULL, FALSE);
/* empty string is no channel */
if (*data == '\0')
return FALSE;
chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes"); chantypes = g_hash_table_lookup(irc_server->isupport, "chantypes");
if (chantypes == NULL) if (chantypes == NULL)
chantypes = "#&!+"; /* normal, local, secure, modeless */ chantypes = "#&!+"; /* normal, local, secure, modeless */
statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg"); statusmsg = g_hash_table_lookup(irc_server->isupport, "statusmsg");
if (statusmsg == NULL) if (statusmsg != NULL)
statusmsg = "@+"; data += strspn(data, statusmsg);
while (strchr(statusmsg, *data) != NULL) /* strchr(3) considers the trailing NUL as part of the string, make sure
data++; * we didn't advance too much. */
return *data != '\0' && strchr(chantypes, *data) != NULL;
return strchr(chantypes, *data) != NULL;
} }
static char **split_line(const SERVER_REC *server, const char *line, static char **split_line(const SERVER_REC *server, const char *line,