Fixed null pointer deref when we try to autojoin a channel of a network not

in the network list.
This commit is contained in:
Diogo Sousa 2013-05-24 20:29:15 +01:00
parent 4878012065
commit 133b0f7d94

View File

@ -1093,7 +1093,8 @@ check_autojoin_channels (server *serv)
strcpy (sess->waitchannel, sess->willjoinchannel); strcpy (sess->waitchannel, sess->willjoinchannel);
sess->willjoinchannel[0] = 0; 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. */ /* session->channelkey is initially unset for channels joined from the favorites. You have to fill them up manually from favorites settings. */
if (fav) if (fav)