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/sha2.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/sha2.c')
| -rw-r--r-- | contrib/pgcrypto/sha2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/pgcrypto/sha2.c b/contrib/pgcrypto/sha2.c index 5de94b2fcda..bde1f61b311 100644 --- a/contrib/pgcrypto/sha2.c +++ b/contrib/pgcrypto/sha2.c @@ -40,6 +40,7 @@ #include <sys/param.h> +#include "px.h" #include "sha2.h" /* @@ -570,7 +571,7 @@ SHA256_Final(uint8 digest[], SHA256_CTX *context) } /* Clean up state data: */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } @@ -899,7 +900,7 @@ SHA512_Final(uint8 digest[], SHA512_CTX *context) } /* Zero out state data */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } @@ -944,7 +945,7 @@ SHA384_Final(uint8 digest[], SHA384_CTX *context) } /* Zero out state data */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } /*** SHA-224: *********************************************************/ @@ -987,5 +988,5 @@ SHA224_Final(uint8 digest[], SHA224_CTX *context) } /* Clean up state data: */ - memset(context, 0, sizeof(*context)); + px_memset(context, 0, sizeof(*context)); } |