espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/malloc_failure' into 'master'

Browse Source 
heap: Fix race condition causing malloc() to fail under some conditions

See merge request !1424
This commit is contained in:
Ivan Grokhotkov
2017-10-19 21:30:26 +08:00
parent c360f8dece b0c5665f15
commit 6cc8099610
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/heap/multi_heap.c
View File

@@ -347,12 +347,22 @@ void *multi_heap_malloc_impl(multi_heap_handle_t heap, size_t size)
size_t best_size = SIZE_MAX; size_t best_size = SIZE_MAX;
size = ALIGN_UP(size); size = ALIGN_UP(size);
if (size == 0 || heap == NULL || heap->free_bytes < size) { if (size == 0 || heap == NULL) {
return NULL; return NULL;
} }
multi_heap_internal_lock(heap); multi_heap_internal_lock(heap);
/* Note: this check must be done while holding the lock as both
malloc & realloc may temporarily shrink the free_bytes value
before they split a large block. This can result in false negatives,
especially if the heap is unfragmented.
*/
if (heap->free_bytes < size) {
MULTI_HEAP_UNLOCK(heap->lock);
return NULL;
}
/* Find best free block to perform the allocation in */ /* Find best free block to perform the allocation in */
prev = &heap->first_block; prev = &heap->first_block;
for (heap_block_t *b = heap->first_block.next_free; b != NULL; b = b->next_free) { for (heap_block_t *b = heap->first_block.next_free; b != NULL; b = b->next_free) {