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

heap_caps: added special case for realloc when previous area is an diram_iram ptr, this will force a malloc/copy/free

Browse Source
This commit is contained in:
Felipe Neves
2019-11-19 15:36:22 -03:00
parent ce9f84fba9
commit 31145f38fa
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/heap/multi_heap_poisoning.c
View File

@@ -21,10 +21,6 @@
#include <sys/param.h>
#include <multi_heap.h>
#include "multi_heap_internal.h"
#if CONFIG_IDF_TARGET_ESP32S2BETA
#include "heap_private.h"
#endif
/* Note: Keep platform-specific parts in this header, this source
file should depend on libc only */
@@ -272,21 +268,8 @@ void *multi_heap_realloc(multi_heap_handle_t heap, void *p, size_t size)
new_head = multi_heap_malloc_impl(heap, size + POISON_OVERHEAD);
if (new_head != NULL) {
result = poison_allocated_region(new_head, size);
#if CONFIG_IDF_TARGET_ESP32S2BETA
//We may need to deal with aliased heap pointers. here too,
//mainly because the heap canary is located before the
//the slot reserved to preserve original DRAM address
//so the original user data is actually p + 4 ahead :
if(esp_ptr_in_diram_dram((void *)p)) {
memcpy(result, p + sizeof(intptr_t), MIN(size, orig_alloc_size));
} else {
memcpy(result, p , MIN(size, orig_alloc_size));
}
#else
memcpy(result, p, MIN(size, orig_alloc_size));
#endif
multi_heap_free(heap, p);
memcpy(result, p, MIN(size, orig_alloc_size));
multi_heap_free(heap, p);
}
#endif