Use the passed buffer in ERR_error_string!

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

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index ee74bc9a2da7c202d00675900e0b01259fca2d84..36f0e4743eefd098e72f18b79bc251b6de834960 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -102,7 +102,7 @@ X509 *d2i_X509(X509 **a, unsigned char **pp, long length)
        M_ASN1_D2I_get(ret->cert_info,d2i_X509_CINF);
        M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
        M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
-       if (ret->name != NULL) Free(ret->name);
+       if (ret->name != NULL) OPENSSL_free(ret->name);
        ret->name=X509_NAME_oneline(ret->cert_info->subject,NULL,0);
 
        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
@@ -117,6 +117,7 @@ X509 *X509_new(void)
        ret->references=1;
        ret->valid=0;
        ret->ex_flags = 0;
+       ret->ex_pathlen = -1;
        ret->name=NULL;
        ret->aux=NULL;
        M_ASN1_New(ret->cert_info,X509_CINF_new);
@@ -152,8 +153,8 @@ void X509_free(X509 *a)
        M_ASN1_BIT_STRING_free(a->signature);
        X509_CERT_AUX_free(a->aux);
 
-       if (a->name != NULL) Free(a->name);
-       Free((char *)a);
+       if (a->name != NULL) OPENSSL_free(a->name);
+       OPENSSL_free(a);
        }
 
 int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,