From: Timo Teräs <timo.teras@iki.fi>
Date: Thu, 26 Jan 2023 14:21:00 +0000 (+0200)
Subject: Remove redundant NULL checks in OpenSSL RSA glue
X-Git-Tag: v9.19.12~93^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0b1ac97bfeff955263551e48d2798d1623905da;p=thirdparty%2Fbind9.git

Remove redundant NULL checks in OpenSSL RSA glue

The OpenSSL free functions are no-op when called with NULL argument,
thus remove the extra checks around *_free() calls in the OpenSSL RSA
glue.
---

diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index f5017b65f7f..cb815b73cc3 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -378,15 +378,9 @@ opensslrsa_generate_pkey(unsigned int key_size, BIGNUM *e,
 	ret = ISC_R_SUCCESS;
 
 err:
-	if (pkey != NULL) {
-		EVP_PKEY_free(pkey);
-	}
-	if (rsa != NULL) {
-		RSA_free(rsa);
-	}
-	if (cb != NULL) {
-		BN_GENCB_free(cb);
-	}
+	EVP_PKEY_free(pkey);
+	RSA_free(rsa);
+	BN_GENCB_free(cb);
 	return (ret);
 }
 
@@ -511,9 +505,7 @@ opensslrsa_generate_pkey(unsigned int key_size, BIGNUM *e,
 	}
 	ret = ISC_R_SUCCESS;
 err:
-	if (ctx != NULL) {
-		EVP_PKEY_CTX_free(ctx);
-	}
+	EVP_PKEY_CTX_free(ctx);
 	return (ret);
 }
 
@@ -668,12 +660,8 @@ opensslrsa_generate(dst_key_t *key, int exp, void (*callback)(int)) {
 	ret = ISC_R_SUCCESS;
 
 err:
-	if (pkey != NULL) {
-		EVP_PKEY_free(pkey);
-	}
-	if (e != NULL) {
-		BN_free(e);
-	}
+	EVP_PKEY_free(pkey);
+	BN_free(e);
 	return (ret);
 }