Imagelibrary/tlsf
1
0
Fork 0
mirror of https://github.com/espressif/tlsf.git synced 2025-11-16 04:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix assertion error due to zero length allocation

Browse Source 
The original code missed a * to check the value of size for
non-zero. This corrects that error and adds an additional check
after the first alignment.
This commit is contained in:
Scott Shawcroft
2024-03-11 12:25:38 -07:00
committed by Guillaume Souchere
parent 81d3779545
commit 0c8ce8f470
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tlsf.c
View File

@@ -284,8 +284,8 @@ static inline __attribute__((always_inline)) void mapping_search(control_t* cont
{
if (*size >= control->small_block_size)
{
const size_t round = (1 << (tlsf_fls_sizet(*size) - control->sl_index_count_log2)) - 1;
*size = (*size + round) & ~round;
const size_t round = (1 << (tlsf_fls_sizet(*size) - control->sl_index_count_log2));
*size = align_up(*size, round);
}
mapping_insert(control, *size, fli, sli);
}
@@ -545,7 +545,7 @@ static inline __attribute__((always_inline)) block_header_t* block_locate_free(c
int fl = 0, sl = 0;
block_header_t* block = 0;
if (size)
if (*size)
{
mapping_search(control, size, &fl, &sl);
@@ -1001,6 +1001,11 @@ void* tlsf_malloc(tlsf_t tlsf, size_t size)
{
control_t* control = tlsf_cast(control_t*, tlsf);
size_t adjust = adjust_request_size(tlsf, size, ALIGN_SIZE);
// Returned size is 0 when the requested size is larger than the max block
// size.
if (adjust == 0) {
return NULL;
}
// block_locate_free() may adjust our allocated size further.
block_header_t* block = block_locate_free(control, &adjust);
return block_prepare_used(control, block, adjust);