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

Merge pull request #771 from JacobBarthelmeh/master

Browse Source 
account for static memory IO_POOL free when general memory was used
This commit is contained in:
toddouska
2017-03-03 08:31:55 -08:00
committed by GitHub
parent 0608cd0dd3 9ab28f9756
commit 2b937e2f23
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wolfcrypt/src/memory.c
View File

@ -539,7 +539,9 @@ void* wolfSSL_Malloc(size_t size, void* heap, int type)
} }
/* case of using fixed IO buffers */ /* case of using fixed IO buffers */
if (mem->flag & WOLFMEM_IO_POOL_FIXED) { if (mem->flag & WOLFMEM_IO_POOL_FIXED &&
(type == DYNAMIC_TYPE_OUT_BUFFER ||
type == DYNAMIC_TYPE_IN_BUFFER)) {
if (type == DYNAMIC_TYPE_OUT_BUFFER) { if (type == DYNAMIC_TYPE_OUT_BUFFER) {
pt = hint->outBuf; pt = hint->outBuf;
} }
@ -547,25 +549,26 @@ void* wolfSSL_Malloc(size_t size, void* heap, int type)
pt = hint->inBuf; pt = hint->inBuf;
} }
} }
else {
/* check if using IO pool flag */ /* check if using IO pool flag */
if (mem->flag & WOLFMEM_IO_POOL && pt == NULL && if (mem->flag & WOLFMEM_IO_POOL &&
(type == DYNAMIC_TYPE_OUT_BUFFER || (type == DYNAMIC_TYPE_OUT_BUFFER ||
type == DYNAMIC_TYPE_IN_BUFFER)) { type == DYNAMIC_TYPE_IN_BUFFER)) {
if (mem->io != NULL) { if (mem->io != NULL) {
pt = mem->io; pt = mem->io;
mem->io = pt->next; mem->io = pt->next;
}
} }
}
/* general static memory */ /* general static memory */
if (pt == NULL) { if (pt == NULL) {
for (i = 0; i < WOLFMEM_MAX_BUCKETS; i++) { for (i = 0; i < WOLFMEM_MAX_BUCKETS; i++) {
if ((word32)size < mem->sizeList[i]) { if ((word32)size < mem->sizeList[i]) {
if (mem->ava[i] != NULL) { if (mem->ava[i] != NULL) {
pt = mem->ava[i]; pt = mem->ava[i];
mem->ava[i] = pt->next; mem->ava[i] = pt->next;
break; break;
}
} }
} }
} }
@ -672,7 +675,7 @@ void wolfSSL_Free(void *ptr, void* heap, int type)
/* fixed IO pools are free'd at the end of SSL lifetime /* fixed IO pools are free'd at the end of SSL lifetime
using FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io) */ using FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io) */
} }
else if (mem->flag & WOLFMEM_IO_POOL && else if (mem->flag & WOLFMEM_IO_POOL && pt->sz == WOLFMEM_IO_SZ &&
(type == DYNAMIC_TYPE_OUT_BUFFER || (type == DYNAMIC_TYPE_OUT_BUFFER ||
type == DYNAMIC_TYPE_IN_BUFFER)) { type == DYNAMIC_TYPE_IN_BUFFER)) {
pt->next = mem->io; pt->next = mem->io;