diff options
author | Bruce Momjian | 2014-04-17 16:37:53 +0000 |
---|---|---|
committer | Bruce Momjian | 2014-04-17 16:37:53 +0000 |
commit | 9fe55259fd61fd9199907623f974caa7af66e780 (patch) | |
tree | 2d2d7fc333474267d375ca35db482b8a4e42e253 /contrib/pgcrypto/pgp-pubenc.c | |
parent | 83defef8c794e7772e4099a7efa2ebac3c62742c (diff) |
pgcrypto: fix memset() calls that might be optimized away
Specifically, on-stack memset() might be removed, so:
* Replace memset() with px_memset()
* Add px_memset to copy_crlf()
* Add px_memset to pgp-s2k.c
Patch by Marko Kreen
Report by PVS-Studio
Backpatch through 8.4.
Diffstat (limited to 'contrib/pgcrypto/pgp-pubenc.c')
-rw-r--r-- | contrib/pgcrypto/pgp-pubenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c index 130d379a8a9..a3d768f7c44 100644 --- a/contrib/pgcrypto/pgp-pubenc.c +++ b/contrib/pgcrypto/pgp-pubenc.c @@ -72,7 +72,7 @@ pad_eme_pkcs1_v15(uint8 *data, int data_len, int res_len, uint8 **res_p) if (res < 0) { - memset(buf, 0, res_len); + px_memset(buf, 0, res_len); px_free(buf); return res; } @@ -122,10 +122,10 @@ create_secmsg(PGP_Context *ctx, PGP_MPI **msg_p, int full_bytes) if (padded) { - memset(padded, 0, full_bytes); + px_memset(padded, 0, full_bytes); px_free(padded); } - memset(secmsg, 0, klen + 3); + px_memset(secmsg, 0, klen + 3); px_free(secmsg); if (res >= 0) |