diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-05-01 16:02:07 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-01 16:02:07 +0200 |
| commit | b548a1f11c06ccdfa4f52a539912d22d77ee309e (patch) | |
| tree | 37ff8792ddf09e4805aa3ba76b805923d3c52734 /apps/s_server.c | |
| parent | Fix some typo's, silence warnings. (diff) | |
| download | openssl-b548a1f11c06ccdfa4f52a539912d22d77ee309e.tar.xz openssl-b548a1f11c06ccdfa4f52a539912d22d77ee309e.zip | |
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_server.c')
| -rw-r--r-- | apps/s_server.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index a616b64a11..5fb275d0d8 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1956,10 +1956,6 @@ int s_server_main(int argc, char *argv[]) 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 BIO_free(bio_s_out); bio_s_out = NULL; BIO_free(bio_s_msg); @@ -2931,8 +2927,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) err: if (ret >= 0) BIO_printf(bio_s_out, "ACCEPT\n"); - if (buf != NULL) - OPENSSL_free(buf); + OPENSSL_free(buf); BIO_free_all(io); return (ret); } @@ -3065,8 +3060,7 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context) err: - if (buf != NULL) - OPENSSL_free(buf); + OPENSSL_free(buf); BIO_free_all(io); return (ret); } |