zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 04:43:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'security' into 'master'

Browse source 
See merge request !7
This commit is contained in:
ailin-nemui 2017-01-03 13:44:58 +01:00
commit 6c6c42e3d1
4 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/irc/core/irc-nicklist.c
View file

@ -314,7 +314,11 @@ static void event_whois_ircop(SERVER_REC *server, const char *data)
static void event_nick_invalid(IRC_SERVER_REC *server, const char *data)
{
if (!server->connected)
server_disconnect((SERVER_REC *) server);
/* we used to call server_disconnect but that crashes
irssi because of undefined memory access. instead,
indicate that the connection should be dropped and
let the irc method to the clean-up. */
server->connection_lost = server->no_reconnect = TRUE;
}
static void event_nick_in_use(IRC_SERVER_REC *server, const char *data)

2
src/irc/core/irc-queries.c
View file

@ -45,6 +45,8 @@ QUERY_REC *irc_query_find(IRC_SERVER_REC *server, const char *nick)
{
GSList *tmp;
g_return_val_if_fail(nick != NULL, NULL);
for (tmp = server->queries; tmp != NULL; tmp = tmp->next) {
QUERY_REC *rec = tmp->data;