Remove guards around *_free() calls since these functions handle NULL.

1 files changed, 4 insertions, 7 deletions

diff --git a/src/usr.bin/openssl/smime.c b/src/usr.bin/openssl/smime.c
index 847ee133b6..4222e24bc1 100644
--- a/src/usr.bin/openssl/smime.c
+++ b/src/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);