Changeset 97465 in vbox for trunk/src/VBox/Runtime/common/crypto/iprt-openssl.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/iprt-openssl.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/crypto/iprt-openssl.cpp

@@ -111 +111 @@
         X509 *pOsslCertRet = d2i_X509(&pOsslCert, &pabEncoded, cbEncoded);
         RTMemTmpFree(pvFree);
-        if (pOsslCertRet == pOsslCert)
+        if (pOsslCert != NULL && pOsslCertRet == pOsslCert)
         {
             *ppvOsslCert = pOsslCert;
@@ -181 +181 @@
         X509_ATTRIBUTE *pOsslAttribRet = d2i_X509_ATTRIBUTE(&pOsslAttrib, &pabEncoded, cbEncoded);
         RTMemTmpFree(pvFree);
-        if (pOsslAttribRet == pOsslAttrib)
+        if (pOsslAttrib != NULL && pOsslAttribRet == pOsslAttrib)
         {
             *ppvOsslAttrib = pOsslAttrib;