diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-12 00:58:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 00:58:35 +0200 |
| commit | b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387 (patch) | |
| tree | 40d946c5ff23b3c0c09558f478cc68e87cc71448 /security/nss/lib/pkcs7/p7decode.c | |
| parent | b1d82a62259c6888ea6f3f71f3e0973ea4b4e85e (diff) | |
| parent | 505a561549b5226fd3c7905eaa61fe787dfad243 (diff) | |
| download | UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.gz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.lz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.tar.xz UXP-b0f5f9bc6bb3c8b5ab7b5120dbf7ec48f8445387.zip | |
Merge pull request #477 from JustOff/PR_nss-3.36
Update NSS/NSPR to 3.36.4/4.19
Diffstat (limited to 'security/nss/lib/pkcs7/p7decode.c')
| -rw-r--r-- | security/nss/lib/pkcs7/p7decode.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/security/nss/lib/pkcs7/p7decode.c b/security/nss/lib/pkcs7/p7decode.c index 658c61e44..4f17b8e84 100644 --- a/security/nss/lib/pkcs7/p7decode.c +++ b/security/nss/lib/pkcs7/p7decode.c @@ -560,6 +560,7 @@ sec_pkcs7_decoder_start_decrypt(SEC_PKCS7DecoderContext *p7dcx, int depth, return SECSuccess; no_decryption: + PK11_FreeSymKey(bulkkey); /* * For some reason (error set already, if appropriate), we cannot * decrypt the content. I am not sure what exactly is the right @@ -1031,6 +1032,11 @@ SECStatus SEC_PKCS7DecoderUpdate(SEC_PKCS7DecoderContext *p7dcx, const char *buf, unsigned long len) { + if (!p7dcx) { + PORT_SetError(SEC_ERROR_INVALID_ARGS); + return SECFailure; + } + if (p7dcx->cinfo != NULL && p7dcx->dcx != NULL) { PORT_Assert(p7dcx->error == 0); if (p7dcx->error == 0) { |