Commit 895cba19 authored by Rich Salz's avatar Rich Salz
Browse files

free cleanup 12 



Don't check for NULL before calling free function.  This gets:
        NAME_CONSTRAINTS_free GENERAL_SUBTREE_free ECDSA_METHOD_free
        JPAKE_CTX_free OCSP_REQ_CTX_free SCT_free SRP_VBASE_free
        SRP_gN_free SRP_user_pwd_free TXT_DB_free

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent b0696f8b

apps/apps.c

+3 −6
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl) 
        OPENSSL_free(port);

    if (bio)

        BIO_free_all(bio);

    if (rctx)

    OCSP_REQ_CTX_free(rctx);

    if (rv != 1) {

        BIO_printf(bio_err, "Error loading %s from %s\n",
@@ -1614,7 +1613,6 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr) 
 err:

    if (dbattr_conf)

        NCONF_free(dbattr_conf);

    if (tmpdb)

    TXT_DB_free(tmpdb);

    BIO_free_all(in);

    return retdb;
@@ -1793,7 +1791,6 @@ int rotate_index(const char *dbfile, const char *new_suffix, 
void free_index(CA_DB *db)

{

    if (db) {

        if (db->db)

        TXT_DB_free(db->db);

        OPENSSL_free(db);

    }

apps/ocsp.c

+1 −2
Original line number Diff line number Diff line
@@ -1229,7 +1229,6 @@ static OCSP_RESPONSE *query_responder(BIO *cbio, const char *path, 


    }

 err:

    if (ctx)

    OCSP_REQ_CTX_free(ctx);



    return rsp;

crypto/ecdsa/ecs_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -312,6 +312,8 @@ void ECDSA_METHOD_set_name(ECDSA_METHOD *ecdsa_method, char *name) 


void ECDSA_METHOD_free(ECDSA_METHOD *ecdsa_method)

{

    if (!ecdsa_method)

        return;

    if (ecdsa_method->flags & ECDSA_METHOD_FLAG_ALLOCATED)

        OPENSSL_free(ecdsa_method);

}

crypto/jpake/jpake.c

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ JPAKE_CTX *JPAKE_CTX_new(const char *name, const char *peer_name, 


void JPAKE_CTX_free(JPAKE_CTX *ctx)

{

    if (!ctx)

        return;

    JPAKE_CTX_release(ctx);

    OPENSSL_free(ctx);

}

crypto/ocsp/ocsp_ht.c

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ OCSP_REQ_CTX *OCSP_REQ_CTX_new(BIO *io, int maxline) 


void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx)

{

    if (!rctx)

        return;

    BIO_free(rctx->mem);

    if (rctx->iobuf)

        OPENSSL_free(rctx->iobuf);