diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2016-03-09 11:55:01 +0100 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2016-03-09 11:55:01 +0100 |
| commit | 817e954b0925682a8c8036e2cc52986cd9238bab (patch) | |
| tree | 64f8cbc9b4a2633906cbdad532652d023816fb0f /lib/pkcs7/p7local.c | |
| parent | b1f24c5cf8a2165ed90206b329522dfbb6970448 (diff) | |
| download | nss-hg-817e954b0925682a8c8036e2cc52986cd9238bab.tar.gz | |
Bug 1234510 - Removing empty memset, r=ttaubert
Diffstat (limited to 'lib/pkcs7/p7local.c')
| -rw-r--r-- | lib/pkcs7/p7local.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pkcs7/p7local.c b/lib/pkcs7/p7local.c index 4d99384fc..cd298a963 100644 --- a/lib/pkcs7/p7local.c +++ b/lib/pkcs7/p7local.c @@ -711,8 +711,12 @@ sec_PKCS7Encrypt (sec_PKCS7CipherObject *obj, unsigned char *output, } if (final) { - padlen = padsize ? padsize - (pcount % padsize) : 0; - PORT_Memset (pbuf + pcount, padlen, padlen); + if (padsize) { + padlen = padsize - (pcount % padsize); + PORT_Memset (pbuf + pcount, padlen, padlen); + } else { + padlen = 0; + } rv = (* obj->doit) (obj->cx, output, &ofraglen, max_output_len, pbuf, pcount+padlen); if (rv != SECSuccess) |