wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2495 from JacobBarthelmeh/staticmemory

Browse Source 
check on if free'ing ctx/method back to heap hint
This commit is contained in:
David Garske
2019-10-07 08:10:05 -07:00
committed by GitHub
parent dd9635d8ff 82fc96b7f3
commit 625bd121f2
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/internal.c
View File

@ -1796,7 +1796,16 @@ void SSL_CtxResourceFree(WOLFSSL_CTX* ctx)
wolfEventQueue_Free(&ctx->event_queue); wolfEventQueue_Free(&ctx->event_queue);
#endif /* HAVE_WOLF_EVENT */ #endif /* HAVE_WOLF_EVENT */
#ifdef WOLFSSL_STATIC_MEMORY
if (ctx->onHeap == 1) {
XFREE(ctx->method, ctx->heap, DYNAMIC_TYPE_METHOD);
}
else {
XFREE(ctx->method, NULL, DYNAMIC_TYPE_METHOD);
}
#else
XFREE(ctx->method, ctx->heap, DYNAMIC_TYPE_METHOD); XFREE(ctx->method, ctx->heap, DYNAMIC_TYPE_METHOD);
#endif
ctx->method = NULL; ctx->method = NULL;
if (ctx->suites) { if (ctx->suites) {
XFREE(ctx->suites, ctx->heap, DYNAMIC_TYPE_SUITES); XFREE(ctx->suites, ctx->heap, DYNAMIC_TYPE_SUITES);
@ -1920,10 +1929,17 @@ void FreeSSL_Ctx(WOLFSSL_CTX* ctx)
wc_UnLockMutex(&ctx->countMutex); wc_UnLockMutex(&ctx->countMutex);
if (doFree) { if (doFree) {
void* heap = ctx->heap;
WOLFSSL_MSG("CTX ref count down to 0, doing full free"); WOLFSSL_MSG("CTX ref count down to 0, doing full free");
SSL_CtxResourceFree(ctx); SSL_CtxResourceFree(ctx);
wc_FreeMutex(&ctx->countMutex); wc_FreeMutex(&ctx->countMutex);
XFREE(ctx, ctx->heap, DYNAMIC_TYPE_CTX); #ifdef WOLFSSL_STATIC_MEMORY
if (ctx->onHeap == 0) {
heap = NULL;
}
#endif
XFREE(ctx, heap, DYNAMIC_TYPE_CTX);
(void)heap; /* not used in some builds */
} }
else { else {
(void)ctx; (void)ctx;

1
src/ssl.c
View File

@ -1398,6 +1398,7 @@ int wolfSSL_CTX_load_static_memory(WOLFSSL_CTX** ctx, wolfSSL_method_func method
WOLFSSL_MSG("Error creating ctx"); WOLFSSL_MSG("Error creating ctx");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
(*ctx)->onHeap = 1; /* free the memory back to heap when done */
} }
/* determine what max applies too */ /* determine what max applies too */

3
wolfssl/internal.h
View File

@ -2617,6 +2617,9 @@ struct WOLFSSL_CTX {
#ifdef HAVE_ENCRYPT_THEN_MAC #ifdef HAVE_ENCRYPT_THEN_MAC
byte disallowEncThenMac:1; /* Don't do Encrypt-Then-MAC */ byte disallowEncThenMac:1; /* Don't do Encrypt-Then-MAC */
#endif #endif
#ifdef WOLFSSL_STATIC_MEMORY
byte onHeap:1; /* whether the ctx/method is put on heap hint */
#endif
#ifdef WOLFSSL_MULTICAST #ifdef WOLFSSL_MULTICAST
byte haveMcast; /* multicast requested */ byte haveMcast; /* multicast requested */
byte mcastID; /* multicast group ID */ byte mcastID; /* multicast group ID */