mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
multi_heap: ensure that malloc(0) return NULL pointer in any poisoning configuration
This commit is contained in:
parent
f9f42a9d90
commit
7fdc9571ba
@ -187,6 +187,10 @@ static bool verify_fill_pattern(void *data, size_t size, bool print_errors, bool
|
|||||||
|
|
||||||
void *multi_heap_aligned_alloc(multi_heap_handle_t heap, size_t size, size_t alignment)
|
void *multi_heap_aligned_alloc(multi_heap_handle_t heap, size_t size, size_t alignment)
|
||||||
{
|
{
|
||||||
|
if (!size) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (size > SIZE_MAX - POISON_OVERHEAD) {
|
if (size > SIZE_MAX - POISON_OVERHEAD) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -213,6 +217,10 @@ void *multi_heap_aligned_alloc(multi_heap_handle_t heap, size_t size, size_t ali
|
|||||||
|
|
||||||
void *multi_heap_malloc(multi_heap_handle_t heap, size_t size)
|
void *multi_heap_malloc(multi_heap_handle_t heap, size_t size)
|
||||||
{
|
{
|
||||||
|
if (!size) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if(size > SIZE_MAX - POISON_OVERHEAD) {
|
if(size > SIZE_MAX - POISON_OVERHEAD) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -159,4 +159,11 @@ TEST_CASE("Capabilities aligned calloc test", "[heap]")
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_CASE("aligned_alloc(0) should return a NULL pointer", "[heap]")
|
||||||
|
{
|
||||||
|
void *p;
|
||||||
|
p = heap_caps_aligned_alloc(32, 0, MALLOC_CAP_DEFAULT);
|
||||||
|
TEST_ASSERT(p == NULL);
|
||||||
}
|
}
|
@ -127,3 +127,9 @@ TEST_CASE("unreasonable allocs should all fail", "[heap]")
|
|||||||
TEST_ASSERT_NULL(test_malloc_wrapper(xPortGetFreeHeapSize() - 1));
|
TEST_ASSERT_NULL(test_malloc_wrapper(xPortGetFreeHeapSize() - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_CASE("malloc(0) should return a NULL pointer", "[heap]")
|
||||||
|
{
|
||||||
|
void *p;
|
||||||
|
p = malloc(0);
|
||||||
|
TEST_ASSERT(p == NULL);
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user