This commit was generated by cvs2svn to track changes on a CVS vendor

[oweals/openssl.git] / crypto / asn1 / x_exten.c

diff --git a/crypto/asn1/x_exten.c b/crypto/asn1/x_exten.c
index 89daf3f226612a51f0785a4038cc35eeb6bd23e2..f5e3ece2261be7279d0057dddd0f602748059682 100644 (file)
--- a/crypto/asn1/x_exten.c
+++ b/crypto/asn1/x_exten.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/x_exten.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -62,8 +62,8 @@
 #include "asn1_mac.h"
 
 /*
- * ASN1err(ASN1_F_D2I_X509_EXTENSION,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_EXTENSION_NEW,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_X509_EXTENSION,ERR_R_ASN1_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_X509_EXTENSION_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
  */
 
 int i2d_X509_EXTENSION(a,pp)
@@ -108,6 +108,10 @@ long length;
        M_ASN1_D2I_start_sequence();
        M_ASN1_D2I_get(ret->object,d2i_ASN1_OBJECT);
 
+       if ((ret->argp != NULL) && (ret->ex_free != NULL))
+               ret->ex_free(ret);
+       ret->argl=0;
+       ret->argp=NULL;
        ret->netscape_hack=0;
        if ((c.slen != 0) &&
                (M_ASN1_next == (V_ASN1_UNIVERSAL|V_ASN1_BOOLEAN)))
@@ -126,12 +130,16 @@ long length;
 X509_EXTENSION *X509_EXTENSION_new()
        {
        X509_EXTENSION *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509_EXTENSION);
-       M_ASN1_New(ret->object,ASN1_OBJECT_new);
+       ret->object=OBJ_nid2obj(NID_undef);
        M_ASN1_New(ret->value,ASN1_OCTET_STRING_new);
        ret->critical=0;
        ret->netscape_hack=0;
+       ret->argl=0L;
+       ret->argp=NULL;
+       ret->ex_free=NULL;
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_EXTENSION_NEW);
        }
@@ -140,6 +148,8 @@ void X509_EXTENSION_free(a)
 X509_EXTENSION *a;
        {
        if (a == NULL) return;
+       if ((a->argp != NULL) && (a->ex_free != NULL))
+               a->ex_free(a);
        ASN1_OBJECT_free(a->object);
        ASN1_OCTET_STRING_free(a->value);
        Free((char *)a);