Mirrors/Lockpick_RCM
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

heap: Fix calloc memset, end node max size on free

Browse source
This commit is contained in:
shchmue 2019-10-25 22:01:23 -06:00
parent 5d44ef0af6
commit 1feb83f1dc
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/mem/heap.c
View file

@ -83,7 +83,7 @@ static void _heap_free(heap_t *heap, u32 addr)
hnode_t *node = (hnode_t *)(addr - sizeof(hnode_t)); hnode_t *node = (hnode_t *)(addr - sizeof(hnode_t));
node->used = 0; node->used = 0;
node = heap->first; node = heap->first;
while (node) while (1)
{ {
if (!node->used) if (!node->used)
{ {
@ -95,7 +95,14 @@ static void _heap_free(heap_t *heap, u32 addr)
node->next->prev = node->prev; node->next->prev = node->prev;
} }
} }
if (node->next)
node = node->next; node = node->next;
else
{
node->size = -1;
break;
}
} }
} }
@ -114,7 +121,7 @@ void *malloc(u32 size)
void *calloc(u32 num, u32 size) void *calloc(u32 num, u32 size)
{ {
void *res = (void *)_heap_alloc(&_heap, num * size, sizeof(hnode_t)); void *res = (void *)_heap_alloc(&_heap, num * size, sizeof(hnode_t));
memset(res, 0, num * size); memset(res, 0, ALIGN(num * size, sizeof(hnode_t)));
return res; return res;
} }