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

heap_caps: enable check of pointer on diram_iram for both S2 and non-S2 platform

Browse Source
This commit is contained in:
Felipe Neves
2019-11-19 10:55:56 -03:00
parent d9ab33118e
commit ce9f84fba9
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/heap/heap_caps.c
View File

@@ -288,7 +288,6 @@ IRAM_ATTR void *heap_caps_realloc( void *ptr, size_t size, int caps)
return NULL; return NULL;
} }
#if CONFIG_IDF_TARGET_ESP32S2BETA
//On esp32s2 the pointer to heap may be aliased, we need to //On esp32s2 the pointer to heap may be aliased, we need to
//recover it before to manage a new allocation: //recover it before to manage a new allocation:
if(esp_ptr_in_diram_iram((void *)ptr)) { if(esp_ptr_in_diram_iram((void *)ptr)) {
@@ -297,7 +296,6 @@ IRAM_ATTR void *heap_caps_realloc( void *ptr, size_t size, int caps)
ptr = (void *)dram_addr[-1]; ptr = (void *)dram_addr[-1];
//printf("[HEAP_CAPS_MALLOC]: obtained pointer that was aliased: %p \n", (void *)ptr); //printf("[HEAP_CAPS_MALLOC]: obtained pointer that was aliased: %p \n", (void *)ptr);
} }
#endif
heap_t *heap = find_containing_heap(ptr); heap_t *heap = find_containing_heap(ptr);
assert(heap != NULL && "realloc() pointer is outside heap areas"); assert(heap != NULL && "realloc() pointer is outside heap areas");