1
0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00

Merge pull request #529 from ailin-nemui/issue500

fix nick->host == NULL crash
This commit is contained in:
ailin-nemui 2016-08-25 04:24:07 +02:00
parent 31c0a9d7e8
commit 3c29b44408

View File

@ -602,9 +602,6 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
char *nickhost, *p; char *nickhost, *p;
int n; int n;
if (nick->host == NULL)
return;
firstnick = g_hash_table_lookup(channel->nicks, nick->nick); firstnick = g_hash_table_lookup(channel->nicks, nick->nick);
if (firstnick->next == NULL) if (firstnick->next == NULL)
return; return;
@ -617,6 +614,9 @@ static void sig_nicklist_new(CHANNEL_REC *channel, NICK_REC *nick)
return; /* nope, we have it */ return; /* nope, we have it */
} }
if (nick->host == NULL)
return;
/* identical nick already exists, have to change it somehow.. */ /* identical nick already exists, have to change it somehow.. */
p = strchr(nick->host, '@'); p = strchr(nick->host, '@');
if (p == NULL) p = nick->host; else p++; if (p == NULL) p = nick->host; else p++;