From: Pekka Riikonen <priikone@silcnet.org>
Date: Wed, 11 Sep 2002 07:23:09 +0000 (+0000)
Subject: 	Assure that channel key is set before sending it.
X-Git-Tag: silc.client.0.9.6~102
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=0e579ec1824b195f7a51f159b0e93e5a259685c7

	Assure that channel key is set before sending it.
---

diff --git a/CHANGES b/CHANGES
index 52d12616..7b3a637c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Wed Sep 11 09:22:00 CEST 2002  Pekka Riikonen <priikone@silcnet.org>
+
+	* Assure that channel key is set before sending it.  May
+	  crash server otherwise.  Affected file silcd/packet_send.c.
+
 Tue Sep 10 09:50:08 CEST 2002  Pekka Riikonen <priikone@silcnet.org>
 
 	* Assure that endless loop cannot happen with detached client
diff --git a/apps/silcd/packet_send.c b/apps/silcd/packet_send.c
index ae0f1c7b..000f16df 100644
--- a/apps/silcd/packet_send.c
+++ b/apps/silcd/packet_send.c
@@ -1770,6 +1770,9 @@ void silc_server_send_channel_key(SilcServer server,
   chid = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
   if (!chid)
     return;
+
+  if (!channel->channel_key)
+    return;
  
   /* Encode channel key packet */
   tmp_len = strlen(channel->channel_key->cipher->name);