Bug 1203229 - fix null deref in p7decode, r=ttaubert

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/pkcs7/p7decode.c b/lib/pkcs7/p7decode.c
index 7a52d8203..f968482a8 100644
--- a/lib/pkcs7/p7decode.c
+++ b/lib/pkcs7/p7decode.c
@@ -648,8 +648,16 @@ sec_pkcs7_decoder_notify (void *arg, PRBool before, void *dest, int depth)
 	after = PR_TRUE;
 
     p7dcx = (SEC_PKCS7DecoderContext*)arg;
+    if (!p7dcx) {
+	return;
+    }
+
     cinfo = p7dcx->cinfo;
 
+    if (!cinfo) {
+	return;
+    }
+
     if (cinfo->contentTypeTag == NULL) {
 	if (after && dest == &(cinfo->contentType))
 	    cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType));
@@ -867,6 +875,10 @@ sec_pkcs7_decoder_notify (void *arg, PRBool before, void *dest, int depth)
       case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	encd = cinfo->content.encryptedData;
 
+	if (!encd) {
+	    break;
+	}
+
 	/*
 	 * XXX If the decryption key callback is set, we want to start
 	 * the decryption.  If the callback is not set, we will treat the