From e32ac6ffb718f19c576d2e3330822b9fae4e22cb Mon Sep 17 00:00:00 2001 From: Ruby Martin Date: Mon, 12 Jan 2026 11:30:36 -0700 Subject: [PATCH] XMEMSET with WC_CALLOC_VAR_EX switch WC_ALLOC_VAR_EX with XMEMSET to WC_CALLOC_VAR_EX fix XMEMSET call for WC_CALLOC_VAR_EX --- wolfcrypt/test/test.c | 3 +-- wolfssl/wolfcrypt/types.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index 54f8d7221..f4806a638 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -20187,10 +20187,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t random_bank_test(void) byte outbuf1[16], outbuf2[16]; int i; - WC_ALLOC_VAR_EX(bank, struct wc_rng_bank, 1, HEAP_HINT, + WC_CALLOC_VAR_EX(bank, struct wc_rng_bank, 1, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER, return WC_TEST_RET_ENC_EC(MEMORY_E)); - XMEMSET(bank, 0, sizeof(*bank)); WC_ALLOC_VAR_EX(rng, WC_RNG, 1, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER, diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h index d656411d3..756b27db2 100644 --- a/wolfssl/wolfcrypt/types.h +++ b/wolfssl/wolfcrypt/types.h @@ -912,9 +912,9 @@ enum { WC_DO_NOTHING #define WC_VAR_OK(VAR_NAME) 1 #define WC_CALLOC_VAR(VAR_NAME, VAR_TYPE, VAR_SIZE, HEAP) \ - XMEMSET(VAR_NAME, 0, sizeof(var)) + XMEMSET(VAR_NAME, 0, sizeof(VAR_TYPE)) #define WC_CALLOC_VAR_EX(VAR_NAME, VAR_TYPE, VAR_SIZE, HEAP, TY, ONFAIL)\ - WC_DO_NOTHING + XMEMSET(VAR_NAME, 0, sizeof(VAR_TYPE)) #define WC_FREE_VAR(VAR_NAME, HEAP) WC_DO_NOTHING \ /* nothing to free, its stack */ #define WC_FREE_VAR_EX(VAR_NAME, HEAP, TYPE) WC_DO_NOTHING