Skip to content

Commit

Permalink
Merge branch 'bugfix/linux_heap_realloc_v5.1' into 'release/v5.1'
Browse files Browse the repository at this point in the history
core-system/linux-target: fixed heap_caps_realloc not correctly allocating the... (v5.1)

See merge request espressif/esp-idf!23976
  • Loading branch information
ESP-Marius committed Jul 3, 2023
2 parents 61524a2 + c337759 commit 423931c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/heap/heap_caps_linux.c
Expand Up @@ -80,7 +80,7 @@ void *heap_caps_malloc_prefer( size_t size, size_t num, ... )

static void *heap_caps_realloc_base( void *ptr, size_t size, uint32_t caps)
{
ptr = realloc(ptr, caps);
ptr = realloc(ptr, size);

if (ptr == NULL && size > 0) {
heap_caps_alloc_failed(size, caps, __func__);
Expand Down

0 comments on commit 423931c

Please sign in to comment.