mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'fix/heap-init-iteration-on-failed-alloc' into 'master' 

fix(heap): Loop shouldn't break on failed allocation in heap_caps_init()

See merge request espressif/esp-idf!30218
pull/13651/head
Guillaume Souchere 2024-04-13 01:46:33 +08:00
rodzic bf63862c4a 52ebac9c62
commit 429d72fcb8
1 zmienionych plików z 2 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
components/heap/heap_caps_init.c
Wyświetl plik

@ -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
* 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));
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) {
break;
}
}
}
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);