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 f773d8f0c59be059f4446d9dc7d28fbf203894b8..d4740ee10fd90d30df620689b4f0f232bbfd1b7e 100644 (file)
--- 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);
 }