iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Followed richtroye suggestion and implemented the net == NULL guard in

Browse Source 
servlist_favchan_find().
This commit is contained in:
Diogo Sousa 2013-05-24 21:49:46 +01:00
parent 133b0f7d94
commit 7353bf2698
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/inbound.c
View File

@ -1094,7 +1094,7 @@ check_autojoin_channels (server *serv)
sess->willjoinchannel[0] = 0; sess->willjoinchannel[0] = 0;
/* 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); fav = 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)

7
src/common/servlist.c
View File

@ -877,10 +877,15 @@ servlist_server_find (ircnet *net, char *name, int *pos)
favchannel * favchannel *
servlist_favchan_find (ircnet *net, char *channel, int *pos) servlist_favchan_find (ircnet *net, char *channel, int *pos)
{ {
GSList *list = net->favchanlist; GSList *list;
favchannel *favchan; favchannel *favchan;
int i = 0; int i = 0;
if (net == NULL)
return NULL;
list = net->favchanlist;
while (list) while (list)
{ {
favchan = list->data; favchan = list->data;