From 403c263e0b5279a786d8eb4c187b8eb9d9ca4705 Mon Sep 17 00:00:00 2001 From: Eric Blankenhorn Date: Thu, 20 Feb 2020 17:28:17 -0600 Subject: [PATCH] Fix valgrind issue --- src/ssl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index d7d5a6231..4a4c49756 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -18082,8 +18082,10 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) ctx->block_size = 1; ctx->ivSz = AES_BLOCK_SIZE; - if (iv) - XMEMCPY(ctx->iv, iv, ctx->ivSz); + if (iv != NULL) { + if (iv != ctx->iv) /* Valgrind error when src == dst */ + XMEMCPY(ctx->iv, iv, ctx->ivSz); + } else XMEMSET(ctx->iv, 0, AES_BLOCK_SIZE); @@ -18110,8 +18112,10 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md) ctx->block_size = 1; ctx->ivSz = AES_BLOCK_SIZE; - if (iv) - XMEMCPY(ctx->iv, iv, ctx->ivSz); + if (iv != NULL) { + if (iv != ctx->iv) /* Valgrind error when src == dst */ + XMEMCPY(ctx->iv, iv, ctx->ivSz); + } else XMEMSET(ctx->iv, 0, AES_BLOCK_SIZE);