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-encrypt.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-encrypt.c')
| -rw-r--r-- | contrib/pgcrypto/pgp-encrypt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c index 3b9b5d20edf..48eb3f42af0 100644 --- a/contrib/pgcrypto/pgp-encrypt.c +++ b/contrib/pgcrypto/pgp-encrypt.c @@ -128,7 +128,7 @@ mdc_flush(PushFilter *dst, void *priv) px_md_finish(md, pkt + 2); res = pushf_write(dst, pkt, 2 + MDC_DIGEST_LEN); - memset(pkt, 0, 2 + MDC_DIGEST_LEN); + px_memset(pkt, 0, 2 + MDC_DIGEST_LEN); return res; } @@ -217,7 +217,7 @@ encrypt_free(void *priv) { struct EncStat *st = priv; - memset(st, 0, sizeof(*st)); + px_memset(st, 0, sizeof(*st)); px_free(st); } @@ -299,7 +299,7 @@ pkt_stream_free(void *priv) { struct PktStreamStat *st = priv; - memset(st, 0, sizeof(*st)); + px_memset(st, 0, sizeof(*st)); px_free(st); } @@ -490,7 +490,7 @@ write_prefix(PGP_Context *ctx, PushFilter *dst) prefix[bs + 1] = prefix[bs - 1]; res = pushf_write(dst, prefix, bs + 2); - memset(prefix, 0, bs + 2); + px_memset(prefix, 0, bs + 2); return res < 0 ? res : 0; } @@ -552,7 +552,7 @@ write_symenc_sesskey(PGP_Context *ctx, PushFilter *dst) if (res >= 0) res = pushf_write(dst, pkt, pktlen); - memset(pkt, 0, pktlen); + px_memset(pkt, 0, pktlen); return res; } |