From: Evan Hunt <each@isc.org>
Date: Tue, 20 Mar 2018 09:27:39 +0000 (+0000)
Subject: remove unnecessary comparison
X-Git-Tag: v9.9.13rc1~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0795311bcec4741b53f8f09ca660927f5d4cc926;p=thirdparty%2Fbind9.git

remove unnecessary comparison

(cherry picked from commit 8b1baa10ee7d3693d68e52256021dcdf4bf221e1)
(cherry picked from commit f9da5a735e91f63bd0b36704d91cb39df550500d)
---

diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index f773d8f0c59..d4740ee10fd 100644
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -870,20 +870,20 @@ der_get_octet_string(const unsigned char *p, size_t len,
 }
 
 static int
-der_get_oid(const unsigned char *p, size_t len,
-	    oid *data, size_t *size)
-{
+der_get_oid(const unsigned char *p, size_t len, oid *data, size_t *size) {
 	int n;
 	size_t oldlen = len;
 
 	data->components = NULL;
 	data->length = 0;
-	if (len < 1U)
+	if (len < 1U) {
 		return (ASN1_OVERRUN);
+	}
 
 	data->components = malloc(len * sizeof(*data->components));
-	if (data->components == NULL && len != 0U)
+	if (data->components == NULL) {
 		return (ENOMEM);
+	}
 	data->components[0] = (*p) / 40;
 	data->components[1] = (*p) % 40;
 	--len;
@@ -902,8 +902,9 @@ der_get_oid(const unsigned char *p, size_t len,
 		return (ASN1_OVERRUN);
 	}
 	data->length = n;
-	if (size)
+	if (size) {
 		*size = oldlen;
+	}
 	return (0);
 }