Wed Mar 7 18:38:18 CET 2007 Jochen Eisinger <coffee@silcnet.org>

	* Fixed a core-dump when joining unknown channels.  Affected
	  file apps/irssi/src/silc/core/silc-channels.c

diff --git a/CHANGES b/CHANGES
index 3f82d806e882816c4c4a9d412b3781f1fb9517fc..745717d0f7c284d232ae44cae8c4b9055d4c7747 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Wed Mar  7 18:38:18 CET 2007  Jochen Eisinger <coffee@silcnet.org>
+
+       * 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 <pat@icore.at>
 
        * 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 160e86cb9ce1266f6325af2a519be610feff14c2..4311cca5a8963f3b0496005479764076f19c293d 100644 (file)
--- 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);