aboutsummaryrefslogtreecommitdiffstats
path: root/reftable/publicbasics.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-02-06 07:35:27 +0100
committerJunio C Hamano <gitster@pobox.com>2024-02-06 12:10:08 -0800
commitb4ff12c8eefff9cba73ba3cb7492111adfa31d87 (patch)
treecf75adb950d3c8bc7fd2743513ead645a5dbe453 /reftable/publicbasics.c
parentreftable: introduce macros to grow arrays (diff)
downloadgit-b4ff12c8eefff9cba73ba3cb7492111adfa31d87.tar.gz
git-b4ff12c8eefff9cba73ba3cb7492111adfa31d87.zip
reftable: introduce macros to allocate arrays
Similar to the preceding commit, let's carry over macros to allocate arrays with `REFTABLE_ALLOC_ARRAY()` and `REFTABLE_CALLOC_ARRAY()`. This requires us to change the signature of `reftable_calloc()`, which only takes a single argument right now and thus puts the burden on the caller to calculate the final array's size. This is a net improvement though as it means that we can now provide proper overflow checks when multiplying the array size with the member size. Convert callsites of `reftable_calloc()` to the new signature and start using the new macros where possible. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'reftable/publicbasics.c')
-rw-r--r--reftable/publicbasics.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/reftable/publicbasics.c b/reftable/publicbasics.c
index bcb82530d6..44b84a125e 100644
--- a/reftable/publicbasics.c
+++ b/reftable/publicbasics.c
@@ -37,8 +37,9 @@ void reftable_free(void *p)
free(p);
}
-void *reftable_calloc(size_t sz)
+void *reftable_calloc(size_t nelem, size_t elsize)
{
+ size_t sz = st_mult(nelem, elsize);
void *p = reftable_malloc(sz);
memset(p, 0, sz);
return p;