From c6d9e26e2b35377cba33b0b9e8e30c371bdf68ba Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Wed, 25 Oct 2017 15:26:26 -0400
Subject: Fix crash when connect commands change network
Fixes #2084
---
src/common/inbound.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
(limited to 'src/common')
diff --git a/src/common/inbound.c b/src/common/inbound.c
index 8d299ed8..fb8eb511 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1558,6 +1558,7 @@ inbound_login_end (session *sess, char *text, const message_tags_data *tags_data
GSList *cmdlist;
commandentry *cmd;
server *serv = sess->server;
+ ircnet *net = serv->network;
if (!serv->end_of_motd)
{
@@ -1568,29 +1569,32 @@ inbound_login_end (session *sess, char *text, const message_tags_data *tags_data
}
set_default_modes (serv);
- if (serv->network)
+ if (net)
{
/* there may be more than 1, separated by \n */
- cmdlist = ((ircnet *)serv->network)->commandlist;
+ cmdlist = net->commandlist;
while (cmdlist)
{
cmd = cmdlist->data;
inbound_exec_eom_cmd (cmd->command, sess);
cmdlist = cmdlist->next;
}
+ }
+ /* The previously ran commands can alter the state of the server */
+ if (serv->network != net)
+ return;
- /* send nickserv password */
- if (((ircnet *)serv->network)->pass && inbound_nickserv_login (serv))
- {
- serv->p_ns_identify (serv, ((ircnet *)serv->network)->pass);
- }
+ /* send nickserv password */
+ if (net && net->pass && inbound_nickserv_login (serv))
+ {
+ serv->p_ns_identify (serv, net->pass);
}
/* wait for join if command or nickserv set */
- if (serv->network && prefs.hex_irc_join_delay
- && ((((ircnet *)serv->network)->pass && inbound_nickserv_login (serv))
- || ((ircnet *)serv->network)->commandlist))
+ if (net && prefs.hex_irc_join_delay
+ && ((net->pass && inbound_nickserv_login (serv))
+ || net->commandlist))
{
serv->joindelay_tag = fe_timeout_add_seconds (prefs.hex_irc_join_delay, check_autojoin_channels, serv);
}
--
cgit 1.4.1