updates.

diff --git a/CHANGES b/CHANGES
index 3906ddb2dfb75a2b3a56bebedb58d6d0bc770a32..5fbb25e7a0ae3f9aee9a0dd463ea5360b0730b21 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Sat Jun 16 18:00:00 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Fixed GETKEY crash, it crashed if the command did not succseed.
+
 Tue Jun 12 21:36:18 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Redefined the SILC MP API in lib/silcmath/silcmp.h. The API

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 2e315f79998dd6cc164af3c16a0c1be53dda9df7..f3ae6de00c31f22f77e617bec630ee8e687966c9 100644 (file)
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -457,6 +457,9 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
       SilcBuffer client_id_list;
       uint32 list_count;
 
+      if (!success)
+       return;
+
       channel = va_arg(vp, char *);
       channel_entry = va_arg(vp, SilcChannelEntry);
       modei = va_arg(vp, uint32);
@@ -469,9 +472,6 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
       list_count = va_arg(vp, uint32);
       client_id_list = va_arg(vp, SilcBuffer);
 
-      if (!success)
-       return;
-
       chanrec = silc_channel_find(server, channel);
       if (chanrec != NULL && !success)
        channel_destroy(CHANNEL(chanrec));
@@ -646,6 +646,9 @@ silc_command_reply(SilcClient client, SilcClientConnection conn,
       unsigned char *pk;
       uint32 pk_len;
       
+      if (!success)
+       return;
+      
       id_type = va_arg(vp, uint32);
       entry = va_arg(vp, void *);
       public_key = va_arg(vp, SilcPublicKey);