Merge pull request #867 from JacobBarthelmeh/mutex

fix mutex allocation sanity checks
This commit is contained in:
toddouska 2017-04-19 13:32:55 -07:00 committed by GitHub
commit d6abd4d131

View File

@ -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;
}