diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-01 10:02:07 -0400 |
| commit | b548a1f11c06ccdfa4f52a539912d22d77ee309e (patch) | |
| tree | 37ff8792ddf09e4805aa3ba76b805923d3c52734 /apps/s_client.c | |
| parent | 33fbca83dcd05b77f807fab205c4523b8cfe85b5 (diff) | |
free null cleanup finale
Don't check for NULL before calling OPENSSL_free
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 8d8340d311..a24d2f3b9d 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1985,24 +1985,18 @@ int s_client_main(int argc, char **argv) SSL_free(con); } #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) - if (next_proto.data) - OPENSSL_free(next_proto.data); + OPENSSL_free(next_proto.data); #endif SSL_CTX_free(ctx); X509_free(cert); sk_X509_CRL_pop_free(crls, X509_CRL_free); EVP_PKEY_free(key); sk_X509_pop_free(chain, X509_free); - if (pass) - OPENSSL_free(pass); + OPENSSL_free(pass); X509_VERIFY_PARAM_free(vpm); ssl_excert_free(exc); sk_OPENSSL_STRING_free(ssl_args); SSL_CONF_CTX_free(cctx); -#ifndef OPENSSL_NO_JPAKE - if (jpake_secret && psk_key) - OPENSSL_free(psk_key); -#endif OPENSSL_clear_free(cbuf, BUFSIZZ); OPENSSL_clear_free(sbuf, BUFSIZZ); OPENSSL_clear_free(mbuf, BUFSIZZ); |