coreboot-mirror
/
cmocka
mirror of https://review.coreboot.org/cmocka.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmocka: Add overflow check for test_calloc() 

Makes the implementation behave the same like libc calloc() and not fail with
unpredictable errors in test_malloc() anymore.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Alexander Dahl 2022-12-23 10:35:49 +01:00 committed by Andreas Schneider
parent d87c470017
commit 6ff1378b6f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmocka.c
View File

@ -45,6 +45,8 @@
#include <stdbool.h>
#include <time.h>
#include <float.h>
#include <errno.h>
#include <limits.h>
/*
* This allows to add a platform specific header file. Some embedded platforms
@ -2464,7 +2466,14 @@ void* _test_malloc(const size_t size, const char *file, const int line) {
void* _test_calloc(const size_t number_of_elements, const size_t size,
const char* file, const int line) {
void* const ptr = _test_malloc(number_of_elements * size, file, line);
void *ptr = NULL;
if (size > 0 && number_of_elements > SIZE_MAX / size) {
errno = ENOMEM;
return NULL;
}
ptr = _test_malloc(number_of_elements * size, file, line);
if (ptr) {
memset(ptr, 0, number_of_elements * size);
}