Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/heap_trace_stack_corruption' into 'master'

Browse Source 
fix(heap): avoid stack smash when heap tracing stack depth is 0

See merge request espressif/esp-idf!51416
This commit is contained in:
Alexey Lapshin
2026-08-04 14:28:47 +04:00
parent bcce5b96c1 aecc6eab60
commit 3003d738eb
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/heap/include/heap_trace.inc
View File

@@ -85,24 +85,23 @@ static HEAP_IRAM_ATTR __attribute__((noinline)) void get_call_stack(void **calle
#else // !CONFIG_IDF_TARGET_ARCH_XTENSA
extern uint32_t esp_fp_get_callers(uint32_t frame, void** callers, void** stacks, uint32_t depth);
static HEAP_IRAM_ATTR __attribute__((noinline)) void get_call_stack(void **callers)
{
#if STACK_DEPTH == 0
/* alloced_by[] / freed_by[] are empty — nothing to capture;
* writing callers[0] would smash the caller's stack. */
(void)callers;
#else
uint32_t fp = (uint32_t) __builtin_frame_address(0);
memset(callers, 0, sizeof(void *) * STACK_DEPTH);
#if CONFIG_ESP_SYSTEM_USE_FRAME_POINTER
/* We can skip the current return address since this function won't be inlined */
uint32_t esp_fp_get_callers(uint32_t, void **, void **, uint32_t);
esp_fp_get_callers(fp, callers, NULL, STACK_DEPTH);
#else
/* RISC-V compiler doesn't support `__builtin_frame_address` with a parameter bigger than 0 */
callers[0] = (void*) fp;
#endif
}
#endif
#endif /* CONFIG_IDF_TARGET_ARCH_XTENSA */
ESP_STATIC_ASSERT(STACK_DEPTH >= 0 && STACK_DEPTH <= 32, "CONFIG_HEAP_TRACING_STACK_DEPTH must be in range 0-32");