From 133b0f7d9425219c291f58f12421ff1f2dbdfcbb Mon Sep 17 00:00:00 2001 From: Diogo Sousa Date: Fri, 24 May 2013 20:29:15 +0100 Subject: Fixed null pointer deref when we try to autojoin a channel of a network not in the network list. --- src/common/inbound.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/inbound.c b/src/common/inbound.c index da2cb34c..d0424296 100644 --- a/src/common/inbound.c +++ b/src/common/inbound.c @@ -1093,7 +1093,8 @@ check_autojoin_channels (server *serv) strcpy (sess->waitchannel, sess->willjoinchannel); sess->willjoinchannel[0] = 0; - fav = servlist_favchan_find (serv->network, sess->waitchannel, NULL); /* Is this channel in our favorites? */ + /* Is this channel in our favorites? */ + fav = serv->network == NULL ? NULL : servlist_favchan_find (serv->network, sess->waitchannel, NULL); /* session->channelkey is initially unset for channels joined from the favorites. You have to fill them up manually from favorites settings. */ if (fav) -- cgit 1.4.1