From 9fe55259fd61fd9199907623f974caa7af66e780 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Thu, 17 Apr 2014 12:37:53 -0400
Subject: 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.
---
 contrib/pgcrypto/internal.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'contrib/pgcrypto/internal.c')

diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index a02c943e049..7b33e496d41 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -142,7 +142,7 @@ int_md5_free(PX_MD *h)
 {
 	MD5_CTX    *ctx = (MD5_CTX *) h->p.ptr;
 
-	memset(ctx, 0, sizeof(*ctx));
+	px_memset(ctx, 0, sizeof(*ctx));
 	px_free(ctx);
 	px_free(h);
 }
@@ -190,7 +190,7 @@ int_sha1_free(PX_MD *h)
 {
 	SHA1_CTX   *ctx = (SHA1_CTX *) h->p.ptr;
 
-	memset(ctx, 0, sizeof(*ctx));
+	px_memset(ctx, 0, sizeof(*ctx));
 	px_free(ctx);
 	px_free(h);
 }
@@ -265,7 +265,7 @@ intctx_free(PX_Cipher *c)
 
 	if (cx)
 	{
-		memset(cx, 0, sizeof *cx);
+		px_memset(cx, 0, sizeof *cx);
 		px_free(cx);
 	}
 	px_free(c);
@@ -658,7 +658,7 @@ system_reseed(void)
 		skip = buf[0] >= SYSTEM_RESEED_CHANCE;
 	}
 	/* clear 1 byte */
-	memset(buf, 0, sizeof(buf));
+	px_memset(buf, 0, sizeof(buf));
 
 	if (skip)
 		return;
@@ -668,7 +668,7 @@ system_reseed(void)
 		fortuna_add_entropy(buf, n);
 
 	seed_time = t;
-	memset(buf, 0, sizeof(buf));
+	px_memset(buf, 0, sizeof(buf));
 }
 
 int
-- 
cgit v1.2.3