commit 4898d3f39597e65c56e057df7b81b04407111125
author Theo Buehler <theorbuehler@gmail.com> Thu Mar 21 22:28:02 2024 +1000
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 11 17:02:17 2024 +0000
tree 0ad76b4f18c50730605a4297c7a59867c513c34a
parent 89f097740e6376521926eb56a61b25f639c473ac

Remove unnecessary NULL checks

These NULL checks are redundant with sk_num()'s semantics.

Change-Id: I9871bd97c3188fa67f8701ba3eb12395d955d162
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/67388
Commit-Queue: Adam Langley <agl@google.com>
Auto-Submit: Theo Buehler <theorbuehler@gmail.com>
Reviewed-by: Adam Langley <agl@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

crypto/x509/x509_trs.c

diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
index 64380c0..7a5b81e 100644
--- a/crypto/x509/x509_trs.c
+++ b/crypto/x509/x509_trs.c
@@ -144,20 +144,16 @@
   if (!ax) {
     return X509_TRUST_UNTRUSTED;
   }
-  if (ax->reject) {
-    for (size_t i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) {
-      const ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->reject, i);
-      if (OBJ_obj2nid(obj) == id) {
-        return X509_TRUST_REJECTED;
-      }
+  for (size_t i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) {
+    const ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->reject, i);
+    if (OBJ_obj2nid(obj) == id) {
+      return X509_TRUST_REJECTED;
     }
   }
-  if (ax->trust) {
-    for (size_t i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) {
-      const ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->trust, i);
-      if (OBJ_obj2nid(obj) == id) {
-        return X509_TRUST_TRUSTED;
-      }
+  for (size_t i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) {
+    const ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(ax->trust, i);
+    if (OBJ_obj2nid(obj) == id) {
+      return X509_TRUST_TRUSTED;
     }
   }
   return X509_TRUST_UNTRUSTED;