Skip to content

Commit e32ac6f

Browse files
committed
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
1 parent 2a5256b commit e32ac6f

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

wolfcrypt/test/test.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20187,10 +20187,9 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t random_bank_test(void)
2018720187
byte outbuf1[16], outbuf2[16];
2018820188
int i;
2018920189

20190-
WC_ALLOC_VAR_EX(bank, struct wc_rng_bank, 1, HEAP_HINT,
20190+
WC_CALLOC_VAR_EX(bank, struct wc_rng_bank, 1, HEAP_HINT,
2019120191
DYNAMIC_TYPE_TMP_BUFFER,
2019220192
return WC_TEST_RET_ENC_EC(MEMORY_E));
20193-
XMEMSET(bank, 0, sizeof(*bank));
2019420193

2019520194
WC_ALLOC_VAR_EX(rng, WC_RNG, 1, HEAP_HINT,
2019620195
DYNAMIC_TYPE_TMP_BUFFER,

wolfssl/wolfcrypt/types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,9 +912,9 @@ enum {
912912
WC_DO_NOTHING
913913
#define WC_VAR_OK(VAR_NAME) 1
914914
#define WC_CALLOC_VAR(VAR_NAME, VAR_TYPE, VAR_SIZE, HEAP) \
915-
XMEMSET(VAR_NAME, 0, sizeof(var))
915+
XMEMSET(VAR_NAME, 0, sizeof(VAR_TYPE))
916916
#define WC_CALLOC_VAR_EX(VAR_NAME, VAR_TYPE, VAR_SIZE, HEAP, TY, ONFAIL)\
917-
WC_DO_NOTHING
917+
XMEMSET(VAR_NAME, 0, sizeof(VAR_TYPE))
918918
#define WC_FREE_VAR(VAR_NAME, HEAP) WC_DO_NOTHING \
919919
/* nothing to free, its stack */
920920
#define WC_FREE_VAR_EX(VAR_NAME, HEAP, TYPE) WC_DO_NOTHING

0 commit comments

Comments
 (0)