Coverity Fix Null Check (#1965)

`X509_ATTRIBUTE_count` dereferences `a` without a NULL check, added it in. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.
aws · Nov 5, 2024 · d5c7252 · d5c7252
1 parent 8f1aae9
commit d5c7252
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c
@@ -192,6 +192,9 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
 }
 
 int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr) {
+  if (attr == NULL) {
+    return 0;
+  }
   return (int)sk_ASN1_TYPE_num(attr->set);
 }
 

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
@@ -2272,7 +2272,8 @@ OPENSSL_EXPORT int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
 OPENSSL_EXPORT void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
                                               int attrtype, void *unused);
 
-// X509_ATTRIBUTE_count returns the number of values in |attr|.
+// X509_ATTRIBUTE_count returns the number of values in |attr| or 0 if |attr|
+// is NULL.
 OPENSSL_EXPORT int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr);
 
 // X509_ATTRIBUTE_get0_object returns the type of |attr|.