From 4eecaf257480f9b22a2885cd4dfb07b26029161c Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Tue, 18 Apr 2017 17:18:19 -0600 Subject: [PATCH] fix mutex allocation sanity checks --- wolfcrypt/src/wc_port.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c index 05feaac96..898e22684 100755 --- a/wolfcrypt/src/wc_port.c +++ b/wolfcrypt/src/wc_port.c @@ -310,11 +310,17 @@ wolfSSL_Mutex* wc_InitAndAllocMutex() { wolfSSL_Mutex* m = (wolfSSL_Mutex*) XMALLOC(sizeof(wolfSSL_Mutex), NULL, DYNAMIC_TYPE_MUTEX); - if (m && wc_InitMutex(m) == 0) - return m; + if (m != NULL) { + if (wc_InitMutex(m) != 0) { + WOLFSSL_MSG("Init Mutex failed"); + XFREE(m, NULL, DYNAMIC_TYPE_MUTEX); + m = NULL; + } + } + else { + WOLFSSL_MSG("Memory error with Mutex allocation"); + } - XFREE(m, NULL, DYNAMIC_TYPE_MUTEX); - m = NULL; return m; }