X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fserver.c;h=46900b2fd7ef08b37aaef5980be4658389c0e8a8;hb=43389514dcd9843a9b642a11cf265ec5afd3b420;hp=d7fc856cef29f6b24d320d0a1f479ca26c20fb70;hpb=20e42b6b0667e69a6c5a16376ab9b563e195e5c0;p=silc.git

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index d7fc856c..46900b2f 100644
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -2877,8 +2877,10 @@ bool silc_server_create_channel_key(SilcServer server,
   }
 
   if (!channel->channel_key)
-    if (!silc_cipher_alloc(SILC_DEFAULT_CIPHER, &channel->channel_key))
+    if (!silc_cipher_alloc(SILC_DEFAULT_CIPHER, &channel->channel_key)) {
+      channel->channel_key = NULL;
       return FALSE;
+    }
 
   if (key_len)
     len = key_len;
@@ -2999,6 +3001,7 @@ SilcChannelEntry silc_server_save_channel_key(SilcServer server,
 
   /* Create new cipher */
   if (!silc_cipher_alloc(cipher, &channel->channel_key)) {
+    channel->channel_key = NULL;
     channel = NULL;
     goto out;
   }
@@ -3374,7 +3377,7 @@ void silc_server_announce_get_channels(SilcServer server,
 	(*channel_ids)[i] = NULL;
 	silc_server_announce_get_channel_users(server, channel,
 					       channel_users,
-					       channel_users_modes[i]);
+					       &(*channel_users_modes)[i]);
 	(*channel_ids)[i] = channel->id;
 	i++;