diff options
| -rw-r--r-- | cmd/smimetools/cmsutil.c | 2 | ||||
| -rw-r--r-- | lib/smime/cmsdigest.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/smimetools/cmsutil.c b/cmd/smimetools/cmsutil.c index 9106d9955..4343695ed 100644 --- a/cmd/smimetools/cmsutil.c +++ b/cmd/smimetools/cmsutil.c @@ -219,7 +219,7 @@ decode(FILE *out, SECItem *input, const struct decodeOptionsStr *decodeOptions) switch (typetag) { case SEC_OID_PKCS7_SIGNED_DATA: { NSSCMSSignedData *sigd = NULL; - SECItem **digests; + SECItem **digests = NULL; int nsigners; int j; diff --git a/lib/smime/cmsdigest.c b/lib/smime/cmsdigest.c index bd1474068..1eb88f0b6 100644 --- a/lib/smime/cmsdigest.c +++ b/lib/smime/cmsdigest.c @@ -239,7 +239,7 @@ NSS_CMSDigestContext_FinishSingle(NSSCMSDigestContext *cmsdigcx, SECItem *digest) { SECStatus rv = SECFailure; - SECItem **dp; + SECItem **dp = NULL; PLArenaPool *arena = NULL; if ((arena = PORT_NewArena(1024)) == NULL) @@ -247,7 +247,7 @@ NSS_CMSDigestContext_FinishSingle(NSSCMSDigestContext *cmsdigcx, /* get the digests into arena, then copy the first digest into poolp */ rv = NSS_CMSDigestContext_FinishMultiple(cmsdigcx, arena, &dp); - if (rv == SECSuccess) { + if (rv == SECSuccess && dp) { /* now copy it into poolp */ rv = SECITEM_CopyItem(poolp, digest, dp[0]); } |