From: Rich Salz <rsalz@openssl.org>
Date: Mon, 25 Apr 2016 12:56:54 +0000 (-0400)
Subject: Fix NULL deref in apps/pkcs7
X-Git-Tag: OpenSSL_1_1_0-pre6~1064
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79356a83b78a2d936dcd022847465d9ebf6c67b1;p=oweals%2Fopenssl.git

Fix NULL deref in apps/pkcs7

Thanks to Brian Carpenter for finding and reporting this.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index ad8330d42f..a2c1c6d04e 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -222,12 +222,16 @@ int pkcs7_main(int argc, char **argv)
         i = OBJ_obj2nid(p7->type);
         switch (i) {
         case NID_pkcs7_signed:
-            certs = p7->d.sign->cert;
-            crls = p7->d.sign->crl;
+            if (p7->d.sign != NULL) {
+                certs = p7->d.sign->cert;
+                crls = p7->d.sign->crl;
+            }
             break;
         case NID_pkcs7_signedAndEnveloped:
-            certs = p7->d.signed_and_enveloped->cert;
-            crls = p7->d.signed_and_enveloped->crl;
+            if (p7->d.signed_and_enveloped != NULL) {
+                certs = p7->d.signed_and_enveloped->cert;
+                crls = p7->d.signed_and_enveloped->crl;
+            }
             break;
         default:
             break;