X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fmem_clr.c;h=add1f780207b7a75f56264c8851bc1ac1af788e2;hb=e274c8fb7273d69b6c152cdcf2e866c193ef1e6f;hp=0b72966cfa1b480edb675d095e7458b17b887423;hpb=df29cc8f77bcf09cdd245feeaea452f5f91e4125;p=openssl.git

diff --git a/crypto/mem_clr.c b/crypto/mem_clr.c
index 0b72966cfa..add1f78020 100644
--- a/crypto/mem_clr.c
+++ b/crypto/mem_clr.c
@@ -64,12 +64,14 @@ unsigned char cleanse_ctr = 0;
 void OPENSSL_cleanse(void *ptr, size_t len)
 	{
 	unsigned char *p = ptr;
-	size_t loop = len;
+	size_t loop = len, ctr = cleanse_ctr;
 	while(loop--)
 		{
-		*(p++) = cleanse_ctr;
-		cleanse_ctr += (17 + (((unsigned char *)&p)[sizeof(unsigned char *)-1] & 0xF));
+		*(p++) = (unsigned char)ctr;
+		ctr += (17 + ((size_t)p & 0xF));
 		}
-	if(memchr(ptr, cleanse_ctr, len))
-		cleanse_ctr += 63;
+	p=memchr(ptr, (unsigned char)ctr, len);
+	if(p)
+		ctr += (63 + (size_t)p);
+	cleanse_ctr = (unsigned char)ctr;
 	}