[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  63b2499b6733022c6d1906709df4d808c44b634e (commit)
      from  5bbdc26cadc01cab811040e861f1f98e0f3af348 (commit)


- Log -----------------------------------------------------------------
commit 63b2499b6733022c6d1906709df4d808c44b634e
Author: Phillip Hellewell <sshock at gmail.com>
Date:   Sat Jun 11 20:04:21 2016 -0400

    RT3053: Check for NULL before dereferencing
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit 6b3602882e089aaca18828a72d9f4072e6a20252)

-----------------------------------------------------------------------

Summary of changes:
 crypto/cms/cms_lib.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index d6cb60d..6d27c49 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -413,6 +413,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:
@@ -488,6 +490,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: