Merge pull request #88 from italiangrid/issue-87

Check certs for NULL before dereferencing it
italiangrid · Apr 1, 2021 · 92cbea9 · 92cbea9
2 parents 749e451 + fdbffde
commit 92cbea9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/api/ccapi/api_util.cc b/src/api/ccapi/api_util.cc
@@ -609,7 +609,13 @@ X509 *vomsdata::check_from_file(AC *ac, std::ifstream &file, const std::string &
   X509_EXTENSION *ext=sk_X509_EXTENSION_value(exts, pos);
 
   AC_CERTS *certs = (AC_CERTS *)X509V3_EXT_d2i(ext);
-  STACK_OF(X509) *certstack = certs->stackcert;
+  STACK_OF(X509) *certstack = certs != NULL ? certs->stackcert : NULL;
+
+  if (certs == NULL || certstack == NULL) {
+    AC_CERTS_free(certs);
+    seterror(VERR_SIGN, "Malformed AC: the AC does not contain the issuer certificate chain");
+    return NULL;
+  }                  
 
   bool success = false;
   bool final = false;