diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2020-08-25 19:49:24 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2020-08-25 19:49:24 +0000 |
| commit | fe9eaf3aafe11428d630bb52bdfa5963f8f456b0 (patch) | |
| tree | 576792a5a3fcdaac9b4f97a91f36f5b87d986dce | |
| parent | Merge branch 'type-limit-fixes' into master (diff) | |
xmalloc: fix edge case handling in xcalloc() function
| -rw-r--r-- | xmalloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,3 +1,4 @@ +#include <assert.h> #include <errno.h> #include <stdarg.h> #include <stdio.h> @@ -36,10 +37,8 @@ xmalloc(size_t size) void * xcalloc(size_t nmemb, size_t size) { - if (unlikely(nmemb == 0 || size == 0)) { - size = 1; - } - return check_alloc(calloc(nmemb, size)); + assert(size != 0); + return check_alloc(calloc(likely(nmemb) ? nmemb : 1, size)); } void * |
