From: Tom Carroll <incentivedesign@gmail.com>
Date: Wed, 12 May 2021 07:46:08 +0000 (-0700)
Subject: Remove NULL checks before deinit GnuTLS objects.
X-Git-Tag: v8.20~182
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2c1cd7768fc2de038d0a071b28fdbeb104729bc8;p=users%2Fdwmw2%2Fopenconnect.git

Remove NULL checks before deinit GnuTLS objects.

GnuTLS handles these just like a traditional free() function and copes
if they're NULL. We don't have to check.

Signed-off-by: Tom Carroll <incentivedesign@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/gnutls.c b/gnutls.c
index 3b400e07..97aeaeb6 100644
--- a/gnutls.c
+++ b/gnutls.c
@@ -937,10 +937,8 @@ struct gtls_cert_info {
 
 static void free_gtls_cert_info(struct gtls_cert_info *gci)
 {
-	if (gci->crl)
-		gnutls_x509_crl_deinit(gci->crl);
-	if (gci->pkey)
-		gnutls_privkey_deinit(gci->pkey);
+	gnutls_x509_crl_deinit(gci->crl);
+	gnutls_privkey_deinit(gci->pkey);
 	if (gci->certs) {
 		for (int i = 0; i < gci->nr_certs; i++)
 			gnutls_x509_crt_deinit(gci->certs[i]);