diff options
| author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-06-30 14:51:24 +0000 |
|---|---|---|
| committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-06-30 14:51:24 +0000 |
| commit | 010995281156ce6da912ac3afeec5de7ba457257 (patch) | |
| tree | d419138f888934d120b9cdb9e87de420c32a64e1 /lib/pkcs12 | |
| parent | 19fc8ec5e632046a98a8a4fc7d4a20146dc24dd3 (diff) | |
| download | nss-hg-010995281156ce6da912ac3afeec5de7ba457257.tar.gz | |
Bug 1649322 - Fix null pointer passed as argument in pk11wrap/pk11pbe.c:1246 r=kjacobs
Differential Revision: https://phabricator.services.mozilla.com/D81668
Diffstat (limited to 'lib/pkcs12')
| -rw-r--r-- | lib/pkcs12/p12d.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pkcs12/p12d.c b/lib/pkcs12/p12d.c index fae162657..be70ae775 100644 --- a/lib/pkcs12/p12d.c +++ b/lib/pkcs12/p12d.c @@ -1349,6 +1349,9 @@ sec_pkcs12_decoder_verify_mac(SEC_PKCS12DecoderContext *p12dcx) iteration = 1; } + if (!p12dcx->pwitem->data) { + goto loser; + } params = PK11_CreatePBEParams(&p12dcx->macData.macSalt, p12dcx->pwitem, iteration); |