summaryrefslogtreecommitdiffstats
path: root/usr.bin/openssl/smime.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2018-02-07 04:57:06 +0000
committerjsing <jsing@openbsd.org>2018-02-07 04:57:06 +0000
commit4fe8ecdd3e465327690be8f444c310fb6ffded9c (patch)
tree689b0c6765b983e88f9e9cfed95f862054f377ff /usr.bin/openssl/smime.c
parentRemove guards around *_free() calls since these functions handle NULL. (diff)
downloadwireguard-openbsd-4fe8ecdd3e465327690be8f444c310fb6ffded9c.tar.xz
wireguard-openbsd-4fe8ecdd3e465327690be8f444c310fb6ffded9c.zip
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);