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

free null cleanup finale 



Don't check for NULL before calling OPENSSL_free

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

apps/apps.c

+2 −6
Original line number Diff line number Diff line
@@ -2165,9 +2165,7 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret) 


    BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");



    if (psk_key)

    OPENSSL_free(psk_key);



    psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));



    BIO_pop(bconn);
@@ -2197,9 +2195,7 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret) 


    BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");



    if (psk_key)

    OPENSSL_free(psk_key);



    psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));



    BIO_pop(bconn);

apps/asn1pars.c

+3 −5
Original line number Diff line number Diff line
@@ -321,11 +321,9 @@ int asn1parse_main(int argc, char **argv) 
        ERR_print_errors(bio_err);

    if (buf != NULL)

        BUF_MEM_free(buf);

    if (name != NULL)

    OPENSSL_free(name);

    if (header != NULL)

    OPENSSL_free(header);

    if (strictpem && str != NULL)

    if (strictpem)

        OPENSSL_free(str);

    ASN1_TYPE_free(at);

    if (osk != NULL)

apps/ca.c

+4 −8
Original line number Diff line number Diff line
@@ -2271,7 +2271,6 @@ static int do_revoke(X509 *x509, CA_DB *db, int type, char *value) 
    ok = 1;

 end:

    for (i = 0; i < DB_NUMBER; i++) {

        if (row[i] != NULL)

        OPENSSL_free(row[i]);

    }

    return (ok);
@@ -2339,7 +2338,6 @@ static int get_certificate_status(const char *serial, CA_DB *db) 
    }

 end:

    for (i = 0; i < DB_NUMBER; i++) {

        if (row[i] != NULL)

        OPENSSL_free(row[i]);

    }

    return (ok);
@@ -2564,7 +2562,6 @@ int make_revoked(X509_REVOKED *rev, const char *str) 


 end:



    if (tmp)

    OPENSSL_free(tmp);

    ASN1_OBJECT_free(hold);

    ASN1_GENERALIZEDTIME_free(comp_time);
@@ -2719,7 +2716,6 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold, 


 end:



    if (tmp)

    OPENSSL_free(tmp);

    ASN1_GENERALIZEDTIME_free(comp_time);

apps/cms.c

+4 −8
Original line number Diff line number Diff line
@@ -1121,11 +1121,8 @@ int cms_main(int argc, char **argv) 
        sk_OPENSSL_STRING_free(sksigners);

    if (skkeys)

        sk_OPENSSL_STRING_free(skkeys);

    if (secret_key)

    OPENSSL_free(secret_key);

    if (secret_keyid)

    OPENSSL_free(secret_keyid);

    if (pwri_tmp)

    OPENSSL_free(pwri_tmp);

    ASN1_OBJECT_free(econtent_type);

    if (rr)
@@ -1152,7 +1149,6 @@ int cms_main(int argc, char **argv) 
    BIO_free(in);

    BIO_free(indata);

    BIO_free_all(out);

    if (passin)

    OPENSSL_free(passin);

    return (ret);

}

apps/dgst.c

+1 −2
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ int dgst_main(int argc, char **argv) 
        sk_OPENSSL_STRING_free(sigopts);

    if (macopts)

        sk_OPENSSL_STRING_free(macopts);

    if (sigbuf)

    OPENSSL_free(sigbuf);

    BIO_free(bmd);

    return (ret);