wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix free of WOLFSSL_METHOD pointer on create ctx fail

Browse Source
This commit is contained in:
Jacob Barthelmeh
2016-03-23 09:27:27 -06:00
parent d8fb4b6ee7
commit 620e4fa5ca
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -154,6 +154,11 @@ static volatile int initRefCount = 0;
static wolfSSL_Mutex count_mutex; /* init ref count mutex */ static wolfSSL_Mutex count_mutex; /* init ref count mutex */
/* Create a new WOLFSSL_CTX struct and return the pointer to created struct.
WOLFSSL_METHOD pointer passed in is given to ctx to manage.
This function frees the passed in WOLFSSL_METHOD struct on failure and on
success is freed when ctx is freed.
*/
WOLFSSL_CTX* wolfSSL_CTX_new(WOLFSSL_METHOD* method) WOLFSSL_CTX* wolfSSL_CTX_new(WOLFSSL_METHOD* method)
{ {
WOLFSSL_CTX* ctx = NULL; WOLFSSL_CTX* ctx = NULL;
@@ -166,6 +171,9 @@ WOLFSSL_CTX* wolfSSL_CTX_new(WOLFSSL_METHOD* method)
if (ret != SSL_SUCCESS) { if (ret != SSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_Init failed"); WOLFSSL_MSG("wolfSSL_Init failed");
WOLFSSL_LEAVE("WOLFSSL_CTX_new", 0); WOLFSSL_LEAVE("WOLFSSL_CTX_new", 0);
if (method != NULL) {
XFREE(method, NULL, DYNAMIC_TYPE_METHOD);
}
return NULL; return NULL;
} }
} }
@@ -177,6 +185,12 @@ WOLFSSL_CTX* wolfSSL_CTX_new(WOLFSSL_METHOD* method)
if (ctx) { if (ctx) {
if (InitSSL_Ctx(ctx, method) < 0) { if (InitSSL_Ctx(ctx, method) < 0) {
WOLFSSL_MSG("Init CTX failed"); WOLFSSL_MSG("Init CTX failed");
/* check for case when wolfSSL_CTX_free does not free method */
if (ctx == NULL) {
XFREE(method, NULL, DYNAMIC_TYPE_METHOD);
}
wolfSSL_CTX_free(ctx); wolfSSL_CTX_free(ctx);
ctx = NULL; ctx = NULL;
} }