riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/esp_common: fix possible overflow in calloc implementation

Browse Source
This commit is contained in:
Marian Buschsieweke 2021-05-04 14:11:39 +02:00
parent 84169266b4
commit 2f08f676dc
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpu/esp_common/syscalls.c
View File

@ -276,9 +276,13 @@ void* IRAM_ATTR __wrap__realloc_r(struct _reent *r, void* ptr, size_t size)
void* IRAM_ATTR __wrap__calloc_r(struct _reent *r, size_t count, size_t size) void* IRAM_ATTR __wrap__calloc_r(struct _reent *r, size_t count, size_t size)
{ {
void *result = heap_caps_malloc_default(count * size); size_t size_total;
if (__builtin_mul_overflow(count, size, &size_total)) {
return NULL;
}
void *result = heap_caps_malloc_default(size_total);
if (result) { if (result) {
bzero(result, count * size); bzero(result, size_total);
} }
return result; return result;
} }