Check for valid channel creation in JOIN.

diff --git a/CHANGES b/CHANGES
index 9dcb5dfc362894c863bf5fe45c058099467d7694..e3068e8bfccbf0748d1c9b9c1ca694396604ae08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Thu Apr  7 14:50:01 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
          away.  If it does, stop the query.  Affected file
          silcd/server_query.c.
 
+       * Check for valid channel creation in JOIN command reply.
+         Affected file lib/silcclient/command_reply.c.
+
 Wed Apr  6 16:56:53 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
        * Added some better error messages.  Affected file

diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c
index 0c818a96988c18fa1706a3faee0502feb6c5cafa..ecf598c60ae48537a6d3105863d7be7c30f591b2 100644 (file)
--- a/lib/silcclient/command_reply.c
+++ b/lib/silcclient/command_reply.c
@@ -1049,6 +1049,10 @@ SILC_CLIENT_CMD_REPLY_FUNC(join)
     channel = silc_client_add_channel(cmd->client, conn, channel_name,
                                      mode, channel_id);
   }
+  if (!channel) {
+    COMMAND_REPLY_ERROR(SILC_STATUS_ERR_BAD_CHANNEL);
+    goto out;
+  }
 
   conn->current_channel = channel;
   channel->mode = mode;