RT3053: Check for NULL before dereferencing

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 53eade31417ba7c1879a3ea979ee32baa9ba4387..f9c73d1cbf4e88748175958803e0e99aaf4756fa 100644 (file)
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -345,6 +345,8 @@ static STACK_OF(CMS_CertificateChoices)
         return &cms->d.signedData->certificates;
 
     case NID_pkcs7_enveloped:
+        if (cms->d.envelopedData->originatorInfo == NULL)
+            return NULL;
         return &cms->d.envelopedData->originatorInfo->certificates;
 
     default:
@@ -420,6 +422,8 @@ static STACK_OF(CMS_RevocationInfoChoice)
         return &cms->d.signedData->crls;
 
     case NID_pkcs7_enveloped:
+        if (cms->d.envelopedData->originatorInfo == NULL)
+            return NULL;
         return &cms->d.envelopedData->originatorInfo->crls;
 
     default: