Skip to content

Catch calls to initialize an oversize heap #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
satur9nine wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Catch calls to initialize an oversize heap #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/umm_malloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,21 @@ static uint16_t umm_assimilate_down(umm_heap *heap, uint16_t c, uint16_t freemas
/* ------------------------------------------------------------------------- */

void umm_multi_init_heap(umm_heap *heap, void *ptr, size_t size) {
/* Guard against too many blocks for 15-bit indices */
if ((size / UMM_BLOCKSIZE) > UMM_BLOCKNO_MASK)
{
/* Try increasing UMM_BLOCKSIZE if this hits */
DBGLOG_CRITICAL("Heap too large: %u blocks (max %u)\n",
(unsigned) UMM_NUMBLOCKS, (unsigned) UMM_BLOCKNO_MASK);

/* Mark this heap as unusable */
heap->pheap = NULL;
UMM_HEAPSIZE = 0;
UMM_NUMBLOCKS = 0;

return;
}

/* init heap pointer and size, and memset it to 0 */
heap->pheap = ptr;
UMM_HEAPSIZE = size;
Expand Down Expand Up @@ -799,4 +814,4 @@ void *umm_realloc(void *ptr, size_t size){

void umm_free(void *ptr){
umm_multi_free(&umm_heap_current, ptr);
}
}