Changeset 97465 in vbox for trunk/src/VBox/Runtime/common/crypto/store.cpp

Timestamp:

Nov 8, 2022 9:46:10 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/crypto: Corrected and unified the error checking of d2i_TYPE calls and corrected a i2d_TYPE one. Kudos to fth0 for finding these. ticketref:21097

File:

• trunk/src/VBox/Runtime/common/crypto/store.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/crypto/store.cpp

@@ -445 +445 @@
                     && pCertCtx->cbEncoded > 0)
                 {
-                    X509 *pOsslCert = NULL;
+                    X509                *pOsslCert  = NULL;
                     const unsigned char *pabEncoded = (const unsigned char *)pCertCtx->pabEncoded;
-                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert)
+                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert && pOsslCert != NULL)
                     {
                         if (!X509_STORE_add_cert(pOsslStore, pOsslCert))
@@ -501 +501 @@
                     && pCertCtx->cbEncoded > 0)
                 {
-                    X509 *pOsslCert = NULL;
+                    X509                *pOsslCert  = NULL;
                     const unsigned char *pabEncoded = (const unsigned char *)pCertCtx->pabEncoded;
-                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert)
+                    if (d2i_X509(&pOsslCert, &pabEncoded, pCertCtx->cbEncoded) == pOsslCert && pOsslCert != NULL)
                     {
                         if (!sk_X509_push(pOsslStack, pOsslCert))