Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'backport/malloc_zero_return_null_v3.1' into 'release/v3.1'

Browse source 
backport/malloc_zero_return_null_v3.1

See merge request espressif/esp-idf!8142
This commit is contained in:
Angus Gratton 2020-04-01 14:43:26 +08:00
commit 96f16cef80
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/heap/multi_heap_poisoning.c
View file

@ -175,6 +175,10 @@ static bool verify_fill_pattern(void *data, size_t size, bool print_errors, bool
void *multi_heap_malloc(multi_heap_handle_t heap, size_t size)
{
if (!size) {
return NULL;
}
if(size > SIZE_MAX - POISON_OVERHEAD) {
return NULL;
}

6
components/heap/test/test_malloc.c
View file

@ -113,3 +113,9 @@ TEST_CASE("unreasonable allocs should all fail", "[heap]")
TEST_ASSERT_NULL(malloc(xPortGetFreeHeapSize() - 1));
}
TEST_CASE("malloc(0) should return a NULL pointer", "[heap]")
{
void *p;
p = malloc(0);
TEST_ASSERT(p == NULL);
}