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 bf24e92127005681cfea3956fd07ec2b8f4dbc1a..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
-  (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
@@ -711,8 +713,10 @@ _Error:
   }\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
@@ -925,7 +929,7 @@ _Exit:
   @retval     TRUE          The P7Data was correctly formatted for processing.\r
   @retval     FALSE         The P7Data was not correctly formatted for processing.\r
 \r
-*/\r
+**/\r
 BOOLEAN\r
 EFIAPI\r
 Pkcs7GetAttachedContent (\r