summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWouter Coekaerts <coekie@irssi.org>2005-09-10 13:30:23 +0000
committercoekie <coekie@dbcabf3a-b0e7-0310-adc4-f8d773084564>2005-09-10 13:30:23 +0000
commitfd6c2df7f4ec6b252b3278ae16de8d9d8f44cd8f (patch)
tree7228362fac71f4597a2357c2639412d5c6ec0e67
parentd5c5883867ea22623c19402cd00f2e60f3ed08cc (diff)
downloadirssi-fd6c2df7f4ec6b252b3278ae16de8d9d8f44cd8f.zip
don't crash if server sends weird NICK line, patch by Jarno Honkanen (Bug 216)
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3992 dbcabf3a-b0e7-0310-adc4-f8d773084564
-rw-r--r--src/irc/core/irc-nicklist.c1
-rw-r--r--src/irc/dcc/dcc-chat.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c
index ddf62e5b..46dde7b7 100644
--- a/src/irc/core/irc-nicklist.c
+++ b/src/irc/core/irc-nicklist.c
@@ -380,6 +380,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
char *params, *nick;
g_return_if_fail(data != NULL);
+ g_return_if_fail(orignick != NULL);
params = event_get_params(data, 1, &nick);
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 35655c9e..25658a39 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -780,6 +780,7 @@ static void event_nick(IRC_SERVER_REC *server, const char *data,
char *params, *nick, *tag;
g_return_if_fail(data != NULL);
+ g_return_if_fail(orignick != NULL);
params = event_get_params(data, 1, &nick);
if (g_strcasecmp(nick, orignick) == 0) {