Commit 62adbcee authored by Rich Salz's avatar Rich Salz
Browse files

free NULL cleanup 10 



Avoid checking for NULL before calling free functions.  This gets
ssl.*free:
    ssl_sess_cert_free ssl_free ssl_excert_free ssl_cert_free
    SSL_free SSL_SRP_CTX_free SSL_SESSION_free SSL_CTX_free
    SSL_CTX_SRP_CTX_free SSL_CONF_CTX_free

Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent e2010b20

apps/ciphers.c

+2 −4
Original line number Diff line number Diff line
@@ -223,9 +223,7 @@ int MAIN(int argc, char **argv) 
 end:

    if (use_supported && sk)

        sk_SSL_CIPHER_free(sk);

    if (ctx != NULL)

    SSL_CTX_free(ctx);

    if (ssl != NULL)

    SSL_free(ssl);

    BIO_free_all(STDout);

    apps_shutdown();

apps/ocsp.c

+1 −2
Original line number Diff line number Diff line
@@ -1363,7 +1363,6 @@ OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req, 
        BIO_printf(bio_err, "Error querying OCSP responder\n");

 end:

    BIO_free_all(cbio);

    if (ctx)

    SSL_CTX_free(ctx);

    return resp;

}

apps/s_client.c

+2 −4
Original line number Diff line number Diff line
@@ -2024,7 +2024,6 @@ int MAIN(int argc, char **argv) 
    if (next_proto.data)

        OPENSSL_free(next_proto.data);

#endif

    if (ctx != NULL)

    SSL_CTX_free(ctx);

    if (cert)

        X509_free(cert);
@@ -2040,7 +2039,6 @@ int MAIN(int argc, char **argv) 
    ssl_excert_free(exc);

    if (ssl_args)

        sk_OPENSSL_STRING_free(ssl_args);

    if (cctx)

    SSL_CONF_CTX_free(cctx);

#ifndef OPENSSL_NO_JPAKE

    if (jpake_secret && psk_key)

apps/s_server.c

+3 −6
Original line number Diff line number Diff line
@@ -2003,7 +2003,6 @@ int MAIN(int argc, char *argv[]) 
    print_stats(bio_s_out, ctx);

    ret = 0;

 end:

    if (ctx != NULL)

    SSL_CTX_free(ctx);

    if (s_cert)

        X509_free(s_cert);
@@ -2031,7 +2030,6 @@ int MAIN(int argc, char *argv[]) 
        OPENSSL_free(tlscstatp.port);

    if (tlscstatp.path)

        OPENSSL_free(tlscstatp.path);

    if (ctx2 != NULL)

    SSL_CTX_free(ctx2);

    if (s_cert2)

        X509_free(s_cert2);
@@ -2047,7 +2045,6 @@ int MAIN(int argc, char *argv[]) 
    ssl_excert_free(exc);

    if (ssl_args)

        sk_OPENSSL_STRING_free(ssl_args);

    if (cctx)

    SSL_CONF_CTX_free(cctx);

#ifndef OPENSSL_NO_JPAKE

    if (jpake_secret && psk_key)

apps/s_time.c

+3 −6
Original line number Diff line number Diff line
@@ -540,13 +540,10 @@ int MAIN(int argc, char **argv) 


    ret = 0;

 end:

    if (scon != NULL)

    SSL_free(scon);



    if (tm_ctx != NULL) {

    SSL_CTX_free(tm_ctx);

    tm_ctx = NULL;

    }

    apps_shutdown();

    OPENSSL_EXIT(ret);

}