diff options
| author | Bruce Momjian <bruce@momjian.us> | 2014-04-17 12:37:53 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2014-04-17 12:37:53 -0400 |
| commit | fc02b87e2876b2492a3d5eebd3b70be383b08f40 (patch) | |
| tree | 19301491c363e8f87b15d53f1f742b5975161749 /contrib/pgcrypto/pgp-s2k.c | |
| parent | 179c45ae2fb9519a343bc2e38ebe4609097d14af (diff) | |
| download | postgresql-fc02b87e2876b2492a3d5eebd3b70be383b08f40.tar.gz postgresql-fc02b87e2876b2492a3d5eebd3b70be383b08f40.zip | |
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-s2k.c')
| -rw-r--r-- | contrib/pgcrypto/pgp-s2k.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c index 349234e243c..40c05a1a96e 100644 --- a/contrib/pgcrypto/pgp-s2k.c +++ b/contrib/pgcrypto/pgp-s2k.c @@ -75,6 +75,7 @@ calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key, remain = 0; } } + px_memset(buf, 0, sizeof(buf)); return 0; } @@ -118,6 +119,7 @@ calc_s2k_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, unsigned key_len) remain = 0; } } + px_memset(buf, 0, sizeof(buf)); return 0; } @@ -189,6 +191,7 @@ calc_s2k_iter_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, remain = 0; } } + px_memset(buf, 0, sizeof(buf)); return 0; } |