alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-12 05:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(security): improve memory allocation handling in multiple components

Browse Source
This commit is contained in:
Ashish Sharma
2025-07-17 11:17:06 +08:00
parent 8886097fe4
commit 6b02906822
11 changed files with 107 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/heap/heap_caps_linux.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -84,11 +84,15 @@ 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, size);
if (ptr == NULL && size > 0) {
void *new_ptr = realloc(ptr, size);
if (new_ptr == NULL && size > 0) {
heap_caps_alloc_failed(size, caps, __func__);
}
// If realloc fails, it returns NULL and the original pointer is left unchanged.
// If realloc succeeds, it returns a pointer to the allocated memory, which may be the
// same as the original pointer or a new pointer if the memory was moved.
// We return the new pointer, which may be the same as the original pointer.
ptr = new_ptr;
return ptr;
}