diff options
author | inoguchi <> | 2019-08-30 12:32:14 +0000 |
---|---|---|
committer | inoguchi <> | 2019-08-30 12:32:14 +0000 |
commit | 72036bf4bbef02536427f2044486d9b6d6e2e355 (patch) | |
tree | b4be1e6ac5669eed8eddea2d704e84e394b256a5 | |
parent | 2abf1b81b39a65383501f7e8cdcd8f3ef1ff5565 (diff) | |
download | openbsd-72036bf4bbef02536427f2044486d9b6d6e2e355.tar.gz openbsd-72036bf4bbef02536427f2044486d9b6d6e2e355.tar.bz2 openbsd-72036bf4bbef02536427f2044486d9b6d6e2e355.zip |
Remove unnecessary NULL check before free function in openssl(1) dgst
-rw-r--r-- | src/usr.bin/openssl/dgst.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/usr.bin/openssl/dgst.c b/src/usr.bin/openssl/dgst.c index 4f71634dbe..74c31f7d2d 100644 --- a/src/usr.bin/openssl/dgst.c +++ b/src/usr.bin/openssl/dgst.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dgst.c,v 1.17 2019/08/30 12:09:05 inoguchi Exp $ */ | 1 | /* $OpenBSD: dgst.c,v 1.18 2019/08/30 12:32:14 inoguchi Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -462,8 +462,7 @@ dgst_main(int argc, char **argv) | |||
462 | } | 462 | } |
463 | r = 1; | 463 | r = 1; |
464 | mac_end: | 464 | mac_end: |
465 | if (mac_ctx) | 465 | EVP_PKEY_CTX_free(mac_ctx); |
466 | EVP_PKEY_CTX_free(mac_ctx); | ||
467 | if (r == 0) | 466 | if (r == 0) |
468 | goto end; | 467 | goto end; |
469 | } | 468 | } |
@@ -589,18 +588,14 @@ dgst_main(int argc, char **argv) | |||
589 | 588 | ||
590 | end: | 589 | end: |
591 | freezero(buf, BUFSIZE); | 590 | freezero(buf, BUFSIZE); |
592 | if (in != NULL) | 591 | BIO_free(in); |
593 | BIO_free(in); | ||
594 | free(passin); | 592 | free(passin); |
595 | BIO_free_all(out); | 593 | BIO_free_all(out); |
596 | EVP_PKEY_free(sigkey); | 594 | EVP_PKEY_free(sigkey); |
597 | if (dgst_config.sigopts) | 595 | sk_OPENSSL_STRING_free(dgst_config.sigopts); |
598 | sk_OPENSSL_STRING_free(dgst_config.sigopts); | 596 | sk_OPENSSL_STRING_free(dgst_config.macopts); |
599 | if (dgst_config.macopts) | ||
600 | sk_OPENSSL_STRING_free(dgst_config.macopts); | ||
601 | free(sigbuf); | 597 | free(sigbuf); |
602 | if (bmd != NULL) | 598 | BIO_free(bmd); |
603 | BIO_free(bmd); | ||
604 | 599 | ||
605 | return (err); | 600 | return (err); |
606 | } | 601 | } |