Merge branch 'bugfix/heap_psram_fill_v4.1' into 'release/v4.1'

heap: Only fill new heaps with FREE_FILL_PATTERN if Comprehensive poisoning is on (v4.1)

See merge request espressif/esp-idf!8490
This commit is contained in:
Angus Gratton
2020-04-30 13:45:07 +08:00

View File

@@ -354,9 +354,11 @@ void *multi_heap_get_block_owner(multi_heap_block_handle_t block)
multi_heap_handle_t multi_heap_register(void *start, size_t size) multi_heap_handle_t multi_heap_register(void *start, size_t size)
{ {
#ifdef SLOW
if (start != NULL) { if (start != NULL) {
memset(start, FREE_FILL_PATTERN, size); memset(start, FREE_FILL_PATTERN, size);
} }
#endif
return multi_heap_register_impl(start, size); return multi_heap_register_impl(start, size);
} }