The branch master has been updated
via 6b3602882e089aaca18828a72d9f4072e6a20252 (commit)
from 6d6e8070c26a043461edffc05c753d6350b6f085 (commit)
- Log -----------------------------------------------------------------
commit 6b3602882e089aaca18828a72d9f4072e6a20252
Author: Phillip Hellewell <[email protected]>
Date: Sat Jun 11 20:04:21 2016 -0400
RT3053: Check for NULL before dereferencing
Reviewed-by: Tim Hudson <[email protected]>
-----------------------------------------------------------------------
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 53eade3..f9c73d1 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:
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
