From c263fd18a290c8ba0d5e31936aa723fe6e8361c3 Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Wed, 7 Mar 2007 17:39:34 +0000 Subject: [PATCH] Wed Mar 7 18:38:18 CET 2007 Jochen Eisinger * Fixed a core-dump when joining unknown channels. Affected file apps/irssi/src/silc/core/silc-channels.c --- CHANGES | 5 +++++ apps/irssi/src/silc/core/silc-channels.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3f82d806..745717d0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +Wed Mar 7 18:38:18 CET 2007 Jochen Eisinger + + * Fixed a core-dump when joining unknown channels. Affected + file apps/irssi/src/silc/core/silc-channels.c + Tue Mar 6 22:48:25 CET 2007 Patrik Weiskircher * Applied patch from Frank Benkstein. If invalid hmac or cipher diff --git a/apps/irssi/src/silc/core/silc-channels.c b/apps/irssi/src/silc/core/silc-channels.c index 160e86cb..4311cca5 100644 --- a/apps/irssi/src/silc/core/silc-channels.c +++ b/apps/irssi/src/silc/core/silc-channels.c @@ -135,7 +135,7 @@ static void silc_channels_join(SILC_SERVER_REC *server, schannel = channel_setup_find(channel, server->connrec->chatnet); if (key && *key != '\0') g_string_sprintfa(tmpstr, "%s %s", channel, key); - else if (schannel->password && schannel->password[0] != '\0') + else if (schannel && schannel->password && schannel->password[0] != '\0') g_string_sprintfa(tmpstr, "%s %s", channel, schannel->password); else g_string_sprintfa(tmpstr, "%s", channel); -- 2.24.0