Assure that channel key is set before sending it.

diff --git a/CHANGES b/CHANGES
index 52d12616e444165877012340d5cb4615c89de82e..7b3a637cdd4d616532062ea0601e3a73260600ea 100644 (file)
--- 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 ae0f1c7bc7f7efa7dd46b4ee25650a1e23a475a3..000f16df4f1b2018b49c941a08f2c5eb403e55c8 100644 (file)
--- 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);