feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(heap): Loop break on failed alloc

Browse Source 
don't check for heaps_array != NULL in the loop.
The check is done after the loop since it is allowed
for the allocation to fail until finding aa ssuitable
heap.
This commit is contained in:
Guillaume Souchere
2024-04-12 12:21:13 +02:00
parent 7639933eeb
commit 52ebac9c62
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/heap/heap_caps_init.c
View File

@@ -137,15 +137,14 @@ void heap_caps_init(void)
* is done by the top level API heap_caps_malloc(). So we need to add it manually * is done by the top level API heap_caps_malloc(). So we need to add it manually
* after successful allocation. Allocate extra 4 bytes for that purpose. */ * after successful allocation. Allocate extra 4 bytes for that purpose. */
heaps_array = multi_heap_malloc(temp_heaps[i].heap, MULTI_HEAP_ADD_BLOCK_OWNER_SIZE(sizeof(heap_t) * num_heaps)); heaps_array = multi_heap_malloc(temp_heaps[i].heap, MULTI_HEAP_ADD_BLOCK_OWNER_SIZE(sizeof(heap_t) * num_heaps));
assert(heaps_array != NULL);
MULTI_HEAP_SET_BLOCK_OWNER(heaps_array);
heaps_array = (heap_t *)MULTI_HEAP_ADD_BLOCK_OWNER_OFFSET(heaps_array);
if (heaps_array != NULL) { if (heaps_array != NULL) {
break; break;
} }
} }
} }
assert(heaps_array != NULL); /* if NULL, there's not enough free startup heap space */ assert(heaps_array != NULL); /* if NULL, there's not enough free startup heap space */
MULTI_HEAP_SET_BLOCK_OWNER(heaps_array);
heaps_array = (heap_t *)MULTI_HEAP_ADD_BLOCK_OWNER_OFFSET(heaps_array);
memcpy(heaps_array, temp_heaps, sizeof(heap_t)*num_heaps); memcpy(heaps_array, temp_heaps, sizeof(heap_t)*num_heaps);