feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

account for when FreeHandshakeResources is not called

Browse Source
This commit is contained in:
Jacob Barthelmeh
2016-07-19 10:32:25 -06:00
parent 8423ad0e96
commit 17207ff61b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@ -3311,6 +3311,7 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
}
ctx_hint->memory->curHa++;
ctx_hint->memory->curIO++;
ssl_hint->haFlag = 1;
UnLockMutex(&(ctx_hint->memory->memory_mutex));
#ifdef WOLFSSL_HEAP_TEST
}
@ -3684,6 +3685,9 @@ void SSL_ResourceFree(WOLFSSL* ssl)
WOLFSSL_HEAP* ctx_heap;
ctx_heap = ssl_hint->memory;
if (LockMutex(&(ctx_heap->memory_mutex)) != 0) {
WOLFSSL_MSG("Bad memory_mutex lock");
}
ctx_heap->curIO--;
if (FreeFixedIO(ctx_heap, &(ssl_hint->outBuf)) != 1) {
WOLFSSL_MSG("Error freeing fixed output buffer");
@ -3691,6 +3695,10 @@ void SSL_ResourceFree(WOLFSSL* ssl)
if (FreeFixedIO(ctx_heap, &(ssl_hint->inBuf)) != 1) {
WOLFSSL_MSG("Error freeing fixed output buffer");
}
if (ssl_hint->haFlag) { /* check if handshake count has been decreased*/
ctx_heap->curHa--;
}
UnLockMutex(&(ctx_heap->memory_mutex));
/* check if tracking stats */
if (ctx_heap->flag & WOLFMEM_TRACK_STATS) {
@ -3864,6 +3872,7 @@ void FreeHandshakeResources(WOLFSSL* ssl)
WOLFSSL_MSG("Bad memory_mutex lock");
}
ctx_heap->curHa--;
ssl_hint->haFlag = 0; /* set to zero since handshake has been dec */
UnLockMutex(&(ctx_heap->memory_mutex));
#ifdef WOLFSSL_HEAP_TEST
}

1
wolfssl/wolfcrypt/memory.h
View File

@ -137,6 +137,7 @@ WOLFSSL_API int wolfSSL_SetAllocators(wolfSSL_Malloc_cb malloc_function,
WOLFSSL_MEM_CONN_STATS* stats; /* hold individual connection stats */
wc_Memory* outBuf; /* set if using fixed io buffers */
wc_Memory* inBuf;
byte haFlag; /* flag used for checking handshake count */
} WOLFSSL_HEAP_HINT;