diff options
author | Christian Göttsche <cgzones@googlemail.com> | 2020-12-23 21:52:40 +0100 |
---|---|---|
committer | cgzones <cgzones@googlemail.com> | 2021-01-02 22:35:13 +0100 |
commit | 8c8149d146f744b2c0c64b80ba9220bd464de013 (patch) | |
tree | 2ef7fe73216d7d9cc1926b6afad3ee0a3d0a2bb6 /XUtils.c | |
parent | a150a81669027601aefc231f208a715e16b24c62 (diff) |
XUtils: check for multiplication overflow in allocation size
Diffstat (limited to 'XUtils.c')
-rw-r--r-- | XUtils.c | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -13,6 +13,7 @@ in the source distribution for its full text. #include <errno.h> #include <fcntl.h> #include <stdarg.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -36,9 +37,21 @@ void* xMalloc(size_t size) { return data; } +void* xMallocArray(size_t nmemb, size_t size) { + assert(nmemb > 0); + assert(size > 0); + if (SIZE_MAX / nmemb < size) { + fail(); + } + return xMalloc(nmemb * size); +} + void* xCalloc(size_t nmemb, size_t size) { assert(nmemb > 0); assert(size > 0); + if (SIZE_MAX / nmemb < size) { + fail(); + } void* data = calloc(nmemb, size); if (!data) { fail(); @@ -56,6 +69,15 @@ void* xRealloc(void* ptr, size_t size) { return data; } +void* xReallocArray(void* ptr, size_t nmemb, size_t size) { + assert(nmemb > 0); + assert(size > 0); + if (SIZE_MAX / nmemb < size) { + fail(); + } + return xRealloc(ptr, nmemb * size); +} + char* String_cat(const char* s1, const char* s2) { const size_t l1 = strlen(s1); const size_t l2 = strlen(s2); |