diff options
| author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-07-09 16:27:22 +0000 |
|---|---|---|
| committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2020-07-09 16:27:22 +0000 |
| commit | 181d8146204ee0f972d792e11a88762d777094b3 (patch) | |
| tree | 0ea648b1c97c1bb2c5a7868080c9f698c690397d /lib/pk11wrap/pk11pbe.c | |
| parent | b80bc0cbaa38a96704c0a88d1ab349643221a872 (diff) | |
| download | nss-hg-181d8146204ee0f972d792e11a88762d777094b3.tar.gz | |
Bug 1649322 - Fix null pointer passed as argument in pk11wrap/pk11pbe.c:1246 r=kjacobs
This is a fixup patch that reverts https://hg.mozilla.org/projects/nss/rev/cc43ebf5bf88355837c5fafa2f3c46e37626707a and adds a null check around the memcpy in question.
Differential Revision: https://phabricator.services.mozilla.com/D82494
Diffstat (limited to 'lib/pk11wrap/pk11pbe.c')
| -rw-r--r-- | lib/pk11wrap/pk11pbe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pk11wrap/pk11pbe.c b/lib/pk11wrap/pk11pbe.c index 39557c0b3..82303fcd2 100644 --- a/lib/pk11wrap/pk11pbe.c +++ b/lib/pk11wrap/pk11pbe.c @@ -1243,7 +1243,9 @@ PK11_CreatePBEParams(SECItem *salt, SECItem *pwd, unsigned int iterations) if (!pbe_params->pPassword) { goto loser; } - PORT_Memcpy(pbe_params->pPassword, pwd->data, pwd->len); + if (pwd->data) { + PORT_Memcpy(pbe_params->pPassword, pwd->data, pwd->len); + } pbe_params->ulPasswordLen = pwd->len; pbe_params->pSalt = (CK_CHAR_PTR)PORT_ZAlloc(salt->len); |