Commit e6e9170d authored by Rich Salz's avatar Rich Salz
Browse files

Allow NULL for some _free routines. 

Based on the description in https://github.com/openssl/openssl/pull/5757

,
this re-implements the "allow NULL to be passed" behavior of a number of
xxx_free routines.  I also fixed up some egregious formatting errors
that were nearby.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5761)
parent 98c03302

crypto/bio/bss_acpt.c

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ static BIO_ACCEPT *BIO_ACCEPT_new(void) 


static void BIO_ACCEPT_free(BIO_ACCEPT *a)

{

    if (a == NULL)

        return;

    OPENSSL_free(a->param_addr);

    OPENSSL_free(a->param_serv);

    BIO_ADDRINFO_free(a->addr_first);

crypto/bio/bss_conn.c

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,8 @@ BIO_CONNECT *BIO_CONNECT_new(void) 


void BIO_CONNECT_free(BIO_CONNECT *a)

{

    if (a == NULL)

        return;

    OPENSSL_free(a->param_hostname);

    OPENSSL_free(a->param_service);

    BIO_ADDRINFO_free(a->addr_first);

crypto/bn/bn_blind.c

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod) 


void BN_BLINDING_free(BN_BLINDING *r)

{

    if (r == NULL)

        return;

    BN_free(r->A);

    BN_free(r->Ai);

    BN_free(r->e);

crypto/bn/bn_ctx.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ BN_CTX *BN_CTX_secure_new(void) 


void BN_CTX_free(BN_CTX *ctx)

{

    if (ctx == NULL)

        return;

#ifdef BN_CTX_DEBUG

    {

        BN_POOL_ITEM *pool = ctx->pool.head;

crypto/bn/bn_mont.c

+8 −6
Original line number Diff line number Diff line
@@ -208,18 +208,20 @@ BN_MONT_CTX *BN_MONT_CTX_new(void) 
void BN_MONT_CTX_init(BN_MONT_CTX *ctx)

{

    ctx->ri = 0;

    bn_init(&(ctx->RR));

    bn_init(&(ctx->N));

    bn_init(&(ctx->Ni));

    bn_init(&ctx->RR);

    bn_init(&ctx->N);

    bn_init(&ctx->Ni);

    ctx->n0[0] = ctx->n0[1] = 0;

    ctx->flags = 0;

}



void BN_MONT_CTX_free(BN_MONT_CTX *mont)

{

    BN_clear_free(&(mont->RR));

    BN_clear_free(&(mont->N));

    BN_clear_free(&(mont->Ni));

    if (mont == NULL)

        return;

    BN_clear_free(&mont->RR);

    BN_clear_free(&mont->N);

    BN_clear_free(&mont->Ni);

    if (mont->flags & BN_FLG_MALLOCED)

        OPENSSL_free(mont);

}