updates.

diff --git a/CHANGES b/CHANGES
index e0c7eae79d5d31704f15c1dc755ecb39fb0262ce..f04510b2cdbf564d871fbd311b5b33f3f4226c2f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Wed May 29 18:08:15 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
+
+       * Cleanup keys properly.  Affected file is
+         irssi/src/silc/core/clientutil.c.
+
 Tue May 28 20:11:41 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
 
        * Display the user mode on the status bar.  Affected file

diff --git a/apps/irssi/src/silc/core/clientutil.c b/apps/irssi/src/silc/core/clientutil.c
index a98b971426ce54329ddd78482b2d39d986f80bf9..59fb2bac7d82346128528c37fc7095b87c837e67 100644 (file)
--- a/apps/irssi/src/silc/core/clientutil.c
+++ b/apps/irssi/src/silc/core/clientutil.c
@@ -223,7 +223,7 @@ New pair of keys will be created.  Please, answer to following questions.\n\
   if (ret_pub_key)
     *ret_pub_key = pub_key;
 
-  memset(key, 0, sizeof(key_len));
+  memset(key, 0, key_len);
   silc_free(key);
 
   /* Save private key into file */
@@ -239,7 +239,7 @@ New pair of keys will be created.  Please, answer to following questions.\n\
   printf("Press <Enter> to continue...\n");
   getchar();
 
-  memset(key, 0, sizeof(key_len));
+  memset(key, 0, key_len);
   silc_free(key);
 
   silc_rng_free(rng);

diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index 0d0aeec257e8f5a352f093f45fc837053e38df91..59945b6ece412ab3f45141dfd179852ed4724552 100644 (file)
--- a/lib/silcclient/client.c
+++ b/lib/silcclient/client.c
@@ -1340,6 +1340,9 @@ void silc_client_close_connection_real(SilcClient client,
 
   SILC_LOG_DEBUG(("Start"));
 
+  if (!sock && !conn)
+    return;
+
   if (!sock || (sock && conn->sock == sock))
     del = TRUE;
   if (!sock)