commit 79a02de79fe9f73a80e198dc914ff4aaa4551634
author Valerio Setti <valerio.setti@nordicsemi.no> Thu Oct 12 18:48:55 2023 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Wed Oct 25 12:03:36 2023 +0200
tree 73f8ac458c2724519572794e3e710e13541487c4
parent a6c0761c43cb1c70c762db940ab672561b709a2b

cipher: check that ctx_alloc_func is not NULL before calling it

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 9f9f107..fd04a7d 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -263,7 +263,8 @@
 
     memset(ctx, 0, sizeof(mbedtls_cipher_context_t));
 
-    if (NULL == (ctx->cipher_ctx = mbedtls_cipher_get_base(cipher_info)->ctx_alloc_func())) {
+    if ((mbedtls_cipher_get_base(cipher_info)->ctx_alloc_func != NULL) &&
+        (ctx->cipher_ctx = mbedtls_cipher_get_base(cipher_info)->ctx_alloc_func()) == NULL) {
         return MBEDTLS_ERR_CIPHER_ALLOC_FAILED;
     }