summaryrefslogtreecommitdiffstats
path: root/apps/s_client.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_client.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_client.c')
-rw-r--r--apps/s_client.c6
1 files changed, 2 insertions, 4 deletions
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);