summaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-04-11 10:22:36 -0400
committerRich Salz <rsalz@openssl.org>2015-04-11 10:22:36 -0400
commit62adbcee392ba1061bf213174e8c59728e00860e (patch)
treeb0a97dcc7e5d9ff3a60b638e45b254a234b83a41 /apps/s_server.c
parente2010b202a52be9120582537845f422a60d5d8c0 (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/s_server.c')
-rw-r--r--apps/s_server.c9
1 files changed, 3 insertions, 6 deletions
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);