summaryrefslogtreecommitdiff
path: root/usr.bin/openssl/smime.c
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2018-02-07 04:57:07 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2018-02-07 04:57:07 +0000
commit173489263120a98b6c445619b94bdd96db64c836 (patch)
tree8af8759b2d78fbb9f542287722d0b1c9f42970dc /usr.bin/openssl/smime.c
parentae9cf602566613d280301a05a36fd5772b209fef (diff)
Remove guards around *_free() calls since these functions handle NULL.
Diffstat (limited to 'usr.bin/openssl/smime.c')
-rw-r--r--usr.bin/openssl/smime.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.bin/openssl/smime.c b/usr.bin/openssl/smime.c
index 847ee133b68..4222e24bc1b 100644
--- a/usr.bin/openssl/smime.c
+++ b/usr.bin/openssl/smime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smime.c,v 1.8 2017/01/20 08:57:12 deraadt Exp $ */
+/* $OpenBSD: smime.c,v 1.9 2018/02/07 04:57:06 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project.
*/
@@ -625,12 +625,9 @@ end:
ERR_print_errors(bio_err);
sk_X509_pop_free(encerts, X509_free);
sk_X509_pop_free(other, X509_free);
- if (vpm)
- X509_VERIFY_PARAM_free(vpm);
- if (sksigners)
- sk_OPENSSL_STRING_free(sksigners);
- if (skkeys)
- sk_OPENSSL_STRING_free(skkeys);
+ X509_VERIFY_PARAM_free(vpm);
+ sk_OPENSSL_STRING_free(sksigners);
+ sk_OPENSSL_STRING_free(skkeys);
X509_STORE_free(store);
X509_free(cert);
X509_free(recip);