ASN1: Fix NULL pointer dereference on stack allocation failure.

[silc.git] / lib / silcasn1 / silcasn1.c

diff --git a/lib/silcasn1/silcasn1.c b/lib/silcasn1/silcasn1.c
index 007f1990d98fe6baa1680772d5850ba1c11d6e72..2e43b49c233631a017cabee0c7b9d07791e643c3 100644 (file)
--- a/lib/silcasn1/silcasn1.c
+++ b/lib/silcasn1/silcasn1.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2003 - 2005 Pekka Riikonen
+  Copyright (C) 2003 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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;
   }
 
@@ -70,7 +70,7 @@ void silc_asn1_uninit(SilcAsn1 asn1)
   silc_stack_free(asn1->stack2);
 }
 
-#ifdef SILC_DIST_INPLACE
+#if defined(SILC_DEBUG)
 /* Returns string representation of a tag */
 
 const char *silc_asn1_tag_name(SilcAsn1Tag tag)
@@ -94,6 +94,8 @@ const char *silc_asn1_tag_name(SilcAsn1Tag tag)
     return "set";
   case SILC_ASN1_TAG_INTEGER:
     return "integer";
+  case SILC_ASN1_TAG_SHORT_INTEGER:
+    return "short integer";
   case SILC_ASN1_TAG_OID:
     return "oid";
   case SILC_ASN1_TAG_BOOLEAN:
@@ -149,14 +151,17 @@ const char *silc_asn1_tag_name(SilcAsn1Tag tag)
   }
   return "unknown";
 }
+#endif /* SILC_DEBUG */
 
+#ifdef SILC_DIST_TOOLKIT
+#ifdef SILC_DEBUG
 /* Dumps the ASN.1 data block into standard output (stdout). */
 
 SilcBool silc_asn1_dump(SilcAsn1 asn1, SilcBuffer src)
 {
   SilcBool ret = FALSE;
   SilcBerEncoding renc;
-  SilcAsn1Tag rtag;
+  SilcUInt32 rtag;
   const unsigned char *rdata;
   SilcUInt32 rdata_len, len = 0;
   SilcBool rindef;
@@ -165,7 +170,7 @@ SilcBool silc_asn1_dump(SilcAsn1 asn1, SilcBuffer src)
 
   while (silc_buffer_len(src)) {
     /* Decode the BER block */
-    ret = silc_ber_decode(src, NULL, &renc, (SilcUInt32 *)&rtag, &rdata,
+    ret = silc_ber_decode(src, NULL, &renc, &rtag, &rdata,
                          &rdata_len, &rindef, &len);
     if (!ret) {
       SILC_LOG_DEBUG(("Error parsing BER block, malformed ASN.1 data"));
@@ -186,5 +191,5 @@ SilcBool silc_asn1_dump(SilcAsn1 asn1, SilcBuffer src)
 
   return TRUE;
 }
-
-#endif /* SILC_DIST_INPLACE */
+#endif /* SILC_DEBUG */
+#endif /* SILC_DIST_TOOLKIT */