Add missing aes NULL check to SI Labs wc_AesSetKey.

kareem-wolfssl · kareem-wolfssl · commit 0fcfade6a0a9 · 2025-09-23T10:16:47.000-07:00
diff --git a/wolfcrypt/src/port/silabs/silabs_aes.c b/wolfcrypt/src/port/silabs/silabs_aes.c
@@ -48,12 +48,12 @@ int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,
         return BUFFER_E;
     }
 
-    XMEMSET(aes, 0, sizeof(*aes));
-
-    if (keylen > sizeof(aes->key)) {
+    if (aes == NULL || keylen > sizeof(aes->key)) {
         return BAD_FUNC_ARG;
     }
 
+    XMEMSET(aes, 0, sizeof(*aes));
+
     ret = wc_AesSetIV(aes, iv);
     aes->rounds = keylen/4 + 6;
     aes->ctx.cmd_ctx = cc;

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ int wc_AesSetKey(Aes* aes, const byte* userKey, word32 keylen,`
`48`	`48`	`return BUFFER_E;`
`49`	`49`	`}`
`50`	`50`
`51`		`- XMEMSET(aes, 0, sizeof(*aes));`
`52`		`-`
`53`		`- if (keylen > sizeof(aes->key)) {`
	`51`	`+ if (aes == NULL \|\| keylen > sizeof(aes->key)) {`
`54`	`52`	`return BAD_FUNC_ARG;`
`55`	`53`	`}`
`56`	`54`
	`55`	`+ XMEMSET(aes, 0, sizeof(*aes));`
	`56`	`+`
`57`	`57`	`ret = wc_AesSetIV(aes, iv);`
`58`	`58`	`aes->rounds = keylen/4 + 6;`
`59`	`59`	`aes->ctx.cmd_ctx = cc;`