Fix potential NULL pointer dereference (#1067)

aws · Jun 22, 2023 · f49fc13 · f49fc13
1 parent 8402a6e
commit f49fc13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/crypto/x509/name_print.c b/crypto/x509/name_print.c
@@ -178,6 +178,10 @@ static int do_name_ex(BIO *out, const X509_NAME *n, int indent,
     } else {
       objbuf = OBJ_nid2sn(fn_nid);
     }
+    if (objbuf == NULL) {
+      return -1;
+    }
+
     int objlen = strlen(objbuf);
     if (!maybe_write(out, objbuf, objlen) ||
         !maybe_write(out, sep_eq, sep_eq_len)) {

diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c
@@ -185,6 +185,9 @@ int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
   for (; lastpos < n; lastpos++) {
     const X509_ATTRIBUTE *attr =
         sk_X509_ATTRIBUTE_value(req->req_info->attributes, lastpos);
+    if (attr == NULL) {
+      return -1;
+    }
     if (OBJ_cmp(attr->object, obj) == 0) {
       return lastpos;
     }