From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 26 Jan 2010 18:08:42 +0000 (+0000)
Subject: PR: 2138
X-Git-Tag: OpenSSL_0_9_8m~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94137885710fe276454f933f9cbfefbe02ead347;p=oweals%2Fopenssl.git

PR: 2138
Submitted by: Kevin Regan <k.regan@f5.com>

Clear stat structure if -DPURIFY is set to avoid problems on some
platforms which include unitialised fields.
---

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index e12fe0b90c..84276d7d46 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -117,6 +117,15 @@ int RAND_load_file(const char *file, long bytes)
 
 	if (file == NULL) return(0);
 
+#ifdef PURIFY
+	/* struct stat can have padding and unused fields that may not be
+	 * initialized in the call to stat(). We need to clear the entire
+	 * structure before calling RAND_add() to avoid complaints from
+	 * applications such as Valgrind.
+	 */
+	memset(&sb, 0, sizeof(sb));
+#endif
+
 	if (stat(file,&sb) < 0) return(0);
 	RAND_add(&sb,sizeof(sb),0.0);
 	if (bytes == 0) return(ret);