CryptoPkg/BaseCryptLib: Add NULL pointer checks in DH and P7Verify

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Pk / CryptPkcs7Verify.c

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
index 45d5df5e118a2d03e7bc7280a82a30744b18086f..d564591cb7f942d309323d8fe28f723b4de7846c 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7Verify.c
@@ -558,7 +558,9 @@ Pkcs7GetCertificatesList (
     }\r
   }\r
   CtxUntrusted = X509_STORE_CTX_get0_untrusted (CertCtx);\r
     }\r
   }\r
   CtxUntrusted = X509_STORE_CTX_get0_untrusted (CertCtx);\r

-  (VOID)sk_X509_delete_ptr (CtxUntrusted, Signer);\r
+  if (CtxUntrusted != NULL) {\r
+    (VOID)sk_X509_delete_ptr (CtxUntrusted, Signer);\r
+  }\r

 \r
   //\r
   // Build certificates stack chained from Signer's certificate.\r
 \r
   //\r
   // Build certificates stack chained from Signer's certificate.\r


@@ -711,8 +713,10 @@ _Error:
   }\r
   sk_X509_free (Signers);\r
 \r
   }\r
   sk_X509_free (Signers);\r
 \r

-  X509_STORE_CTX_cleanup (CertCtx);\r
-  X509_STORE_CTX_free (CertCtx);\r
+  if (CertCtx != NULL) {\r
+    X509_STORE_CTX_cleanup (CertCtx);\r
+    X509_STORE_CTX_free (CertCtx);\r
+  }\r

 \r
   if (SingleCert != NULL) {\r
     free (SingleCert);\r
 \r
   if (SingleCert != NULL) {\r
     free (SingleCert);\r