mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patched potential bug when defragging. (#920)

Browse Source 
* Patched potential bug when defragging.

Patched a potential bug concerning the '__RemoveNode' function as, when removing certain nodes that are either at the head or tail, it can yield a free list node of size 0 bug as the previous node was removed and its size was set to 0 but not fully removed from the other nodes.

* A few more potential bug patches.
This commit is contained in:
Kevin Yonan 2019-07-28 12:37:31 -07:00 committed by Ray
parent 38ee6156f8
commit 5775f9d224
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rmem.h
View File

@ -164,10 +164,19 @@ static inline size_t __AlignSize(const size_t size, const size_t align)
return (size + (align - 1)) & -align; return (size + (align - 1)) & -align;
} }
static void __RemoveNode(MemNode **const node) static void __RemoveNode(MemPool *const mempool, MemNode **const node)
{ {
((*node)->prev != NULL)? ((*node)->prev->next = (*node)->next) : (*node = (*node)->next); if ((*node)->prev != NULL) (*node)->prev->next = (*node)->next;
((*node)->next != NULL)? ((*node)->next->prev = (*node)->prev) : (*node = (*node)->prev); else {
mempool->freeList.head = (*node)->next;
mempool->freeList.head->prev = NULL;
}
if ((*node)->next != NULL) (*node)->next->prev = (*node)->prev;
else {
mempool->freeList.tail = (*node)->prev;
mempool->freeList.tail->next = NULL;
}
} }
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -242,7 +251,7 @@ void *MemPoolAlloc(MemPool *const mempool, const size_t size)
{ {
// Close in size - reduce fragmentation by not splitting. // Close in size - reduce fragmentation by not splitting.
new_mem = *inode; new_mem = *inode;
__RemoveNode(inode); __RemoveNode(mempool, inode);
mempool->freeList.len--; mempool->freeList.len--;
new_mem->next = new_mem->prev = NULL; new_mem->next = new_mem->prev = NULL;
break; break;
@ -427,7 +436,7 @@ bool MemPoolDefrag(MemPool *const mempool)
// If node is right at the stack, merge it back into the stack. // If node is right at the stack, merge it back into the stack.
mempool->stack.base += (*node)->size; mempool->stack.base += (*node)->size;
(*node)->size = 0UL; (*node)->size = 0UL;
__RemoveNode(node); __RemoveNode(mempool, node);
mempool->freeList.len--; mempool->freeList.len--;
node = &mempool->freeList.head; node = &mempool->freeList.head;
} }
@ -475,6 +484,7 @@ bool MemPoolDefrag(MemPool *const mempool)
(*node)->size = 0UL; (*node)->size = 0UL;
(*node)->next->prev = (*node)->prev; (*node)->next->prev = (*node)->prev;
(*node)->prev->next = (*node)->next; (*node)->prev->next = (*node)->next;
*node = (*node)->next;
mempool->freeList.len--; mempool->freeList.len--;
node = &mempool->freeList.head; node = &mempool->freeList.head;
@ -487,6 +497,7 @@ bool MemPoolDefrag(MemPool *const mempool)
(*node)->size = 0UL; (*node)->size = 0UL;
(*node)->next->prev = (*node)->prev; (*node)->next->prev = (*node)->prev;
(*node)->prev->next = (*node)->next; (*node)->prev->next = (*node)->next;
*node = (*node)->prev;
mempool->freeList.len--; mempool->freeList.len--;
node = &mempool->freeList.head; node = &mempool->freeList.head;