From: Phillip Hellewell <sshock@gmail.com>
Date: Sun, 12 Jun 2016 00:04:21 +0000 (-0400)
Subject: RT3053: Check for NULL before dereferencing
X-Git-Tag: OpenSSL_1_1_0-pre6~485
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b3602882e089aaca18828a72d9f4072e6a20252;p=oweals%2Fopenssl.git

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 53eade3141..f9c73d1cbf 100644
--- 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: