fix: Handle null buffer

JamieHunter · JamieHunter · commit 4d7361a28e58 · 2022-04-14T20:41:11.000-07:00
diff --git a/lib/pkcs11/pkcs11_cert.c b/lib/pkcs11/pkcs11_cert.c
@@ -335,6 +335,10 @@ CK_RV pkcs11_cert_get_subject_key_id(CK_VOID_PTR pObject, CK_ATTRIBUTE_PTR pAttr
             else
             {
                 pAttribute->ulValueLen = 20;
+                if (pAttribute->pValue == NULL)
+                {
+                    return CKR_OK;
+                }
             }
         }
         else
@@ -392,7 +396,7 @@ static CK_RV pkcs11_cert_get_id(CK_VOID_PTR pObject, CK_ATTRIBUTE_PTR pAttribute
         }
         else
         {
-            return pkcs11_attrib_empty(NULL, pAttribute);
+            return pkcs11_attrib_empty(pObject, pAttribute);
         }
     }
     return rv;

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,10 @@ CK_RV pkcs11_cert_get_subject_key_id(CK_VOID_PTR pObject, CK_ATTRIBUTE_PTR pAttr`
`335`	`335`	`else`
`336`	`336`	`{`
`337`	`337`	`pAttribute->ulValueLen = 20;`
	`338`	`+ if (pAttribute->pValue == NULL)`
	`339`	`+ {`
	`340`	`+ return CKR_OK;`
	`341`	`+ }`
`338`	`342`	`}`
`339`	`343`	`}`
`340`	`344`	`else`
`@@ -392,7 +396,7 @@ static CK_RV pkcs11_cert_get_id(CK_VOID_PTR pObject, CK_ATTRIBUTE_PTR pAttribute`
`392`	`396`	`}`
`393`	`397`	`else`
`394`	`398`	`{`
`395`		`- return pkcs11_attrib_empty(NULL, pAttribute);`
	`399`	`+ return pkcs11_attrib_empty(pObject, pAttribute);`
`396`	`400`	`}`
`397`	`401`	`}`
`398`	`402`	`return rv;`