Merge branch 'topic/null-fixes' of git://208.110.73.182/silc into silc.1.1.branch

diff --git a/lib/silcasn1/silcasn1.c b/lib/silcasn1/silcasn1.c
index 5965228be1990640b2e4adf16578f2502d362f77..2e43b49c233631a017cabee0c7b9d07791e643c3 100644 (file)
--- a/lib/silcasn1/silcasn1.c
+++ b/lib/silcasn1/silcasn1.c
@@ -53,7 +53,7 @@ SilcBool silc_asn1_init(SilcAsn1 asn1)
 
   asn1->stack2 = silc_stack_alloc(768);
   if (!asn1->stack2) {
-    silc_stack_free(asn1->stack2);
+    silc_stack_free(asn1->stack1);
     return FALSE;
   }
 

diff --git a/lib/silcclient/client_channel.c b/lib/silcclient/client_channel.c
index 32dac873e13b7f97f0d1d7ca06a04f801f9c0e62..4120695d76af08286853fa5fc5bdf31f0f767220 100644 (file)
--- a/lib/silcclient/client_channel.c
+++ b/lib/silcclient/client_channel.c
@@ -630,7 +630,7 @@ SilcBool silc_client_del_channel_private_keys(SilcClient client,
     channel->cipher = silc_cipher_get_name(channel->internal.send_key);
   else
     channel->cipher = NULL;
-  if (channel->hmac)
+  if (channel->internal.hmac)
     channel->hmac = silc_hmac_get_name(channel->internal.hmac);
   else
     channel->hmac = NULL;