diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-11 10:22:36 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-11 10:22:36 -0400 |
| commit | 62adbcee392ba1061bf213174e8c59728e00860e (patch) | |
| tree | b0a97dcc7e5d9ff3a60b638e45b254a234b83a41 /apps | |
| parent | e2010b202a52be9120582537845f422a60d5d8c0 (diff) | |
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: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ciphers.c | 6 | ||||
| -rw-r--r-- | apps/ocsp.c | 3 | ||||
| -rw-r--r-- | apps/s_client.c | 6 | ||||
| -rw-r--r-- | apps/s_server.c | 9 | ||||
| -rw-r--r-- | apps/s_time.c | 9 |
5 files changed, 11 insertions, 22 deletions
diff --git a/apps/ciphers.c b/apps/ciphers.c index 6c7ff01eea..4b9a114666 100644 --- a/apps/ciphers.c +++ b/apps/ciphers.c @@ -223,10 +223,8 @@ 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); + SSL_CTX_free(ctx); + SSL_free(ssl); BIO_free_all(STDout); apps_shutdown(); OPENSSL_EXIT(ret); diff --git a/apps/ocsp.c b/apps/ocsp.c index 95380964a3..96f4c67421 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -1363,8 +1363,7 @@ 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); + SSL_CTX_free(ctx); return resp; } diff --git a/apps/s_client.c b/apps/s_client.c index ec116171c3..a7e03a5f33 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -2024,8 +2024,7 @@ int MAIN(int argc, char **argv) if (next_proto.data) OPENSSL_free(next_proto.data); #endif - if (ctx != NULL) - SSL_CTX_free(ctx); + SSL_CTX_free(ctx); if (cert) X509_free(cert); if (crls) @@ -2040,8 +2039,7 @@ 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); + SSL_CONF_CTX_free(cctx); #ifndef OPENSSL_NO_JPAKE if (jpake_secret && psk_key) OPENSSL_free(psk_key); diff --git a/apps/s_server.c b/apps/s_server.c index f97a97d8f0..a66098efe7 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2003,8 +2003,7 @@ int MAIN(int argc, char *argv[]) print_stats(bio_s_out, ctx); ret = 0; end: - if (ctx != NULL) - SSL_CTX_free(ctx); + SSL_CTX_free(ctx); if (s_cert) X509_free(s_cert); if (crls) @@ -2031,8 +2030,7 @@ int MAIN(int argc, char *argv[]) OPENSSL_free(tlscstatp.port); if (tlscstatp.path) OPENSSL_free(tlscstatp.path); - if (ctx2 != NULL) - SSL_CTX_free(ctx2); + SSL_CTX_free(ctx2); if (s_cert2) X509_free(s_cert2); EVP_PKEY_free(s_key2); @@ -2047,8 +2045,7 @@ 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); + SSL_CONF_CTX_free(cctx); #ifndef OPENSSL_NO_JPAKE if (jpake_secret && psk_key) OPENSSL_free(psk_key); diff --git a/apps/s_time.c b/apps/s_time.c index 5b94634a53..4f460b6a45 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -540,13 +540,10 @@ int MAIN(int argc, char **argv) ret = 0; end: - if (scon != NULL) - SSL_free(scon); + SSL_free(scon); - if (tm_ctx != NULL) { - SSL_CTX_free(tm_ctx); - tm_ctx = NULL; - } + SSL_CTX_free(tm_ctx); + tm_ctx = NULL; apps_shutdown(); OPENSSL_EXIT(ret); } |