Skip to content

reftable: widen allocation size arguments to uintmax_t #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msuozzo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

reftable: widen allocation size arguments to uintmax_t #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d083bc
Makefile: build the reftable record unit tests
msuozzo Oct 19, 2026
8f4a838
reftable/basics: widen allocation size arguments to uintmax_t
msuozzo Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,6 +1551,7 @@ CLAR_TEST_SUITES += u-reftable-block
CLAR_TEST_SUITES += u-reftable-merged
CLAR_TEST_SUITES += u-reftable-pq
CLAR_TEST_SUITES += u-reftable-readwrite
CLAR_TEST_SUITES += u-reftable-record
CLAR_TEST_SUITES += u-reftable-stack
CLAR_TEST_SUITES += u-reftable-table
CLAR_TEST_SUITES += u-reftable-tree
Expand Down
9 changes: 5 additions & 4 deletions reftable/basics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,19 @@ void reftable_free(void *p)
free(p);
}

void *reftable_calloc(size_t nelem, size_t elsize)
void *reftable_calloc(uintmax_t nelem, uintmax_t elsize)
{
size_t size;
void *p;

if (nelem && elsize > SIZE_MAX / nelem)
if (reftable_alloc_size(nelem, elsize, &size) < 0)
return NULL;

p = reftable_malloc(nelem * elsize);
p = reftable_malloc(size);
if (!p)
return NULL;

memset(p, 0, nelem * elsize);
memset(p, 0, size);
return p;
}

Expand Down
5 changes: 3 additions & 2 deletions reftable/basics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,11 @@ size_t names_length(const char **names);
void *reftable_malloc(size_t sz);
void *reftable_realloc(void *p, size_t sz);
void reftable_free(void *p);
void *reftable_calloc(size_t nelem, size_t elsize);
void *reftable_calloc(uintmax_t nelem, uintmax_t elsize);
char *reftable_strdup(const char *str);

static inline int reftable_alloc_size(size_t nelem, size_t elsize, size_t *out)
static inline int reftable_alloc_size(uintmax_t nelem, uintmax_t elsize,
size_t *out)
{
if (nelem && elsize > SIZE_MAX / nelem)
return -1;
Expand Down
18 changes: 18 additions & 0 deletions t/unit-tests/u-reftable-basics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,24 @@ void test_reftable_basics__put_get_be16(void)
cl_assert_equal_i(in, out);
}

void test_reftable_basics__alloc_size(void)
{
size_t out;

cl_assert_equal_i(reftable_alloc_size(3, 5, &out), 0);
cl_assert_equal_i(out, 15);
cl_assert(reftable_alloc_size(SIZE_MAX, 2, &out) < 0);

/* Counts that do not fit in a size_t. */
if (SIZE_MAX < UINTMAX_MAX) {
cl_assert(reftable_alloc_size((uintmax_t)SIZE_MAX + 1,
1, &out) < 0);
cl_assert(reftable_alloc_size(1, (uintmax_t)SIZE_MAX + 1,
&out) < 0);
cl_assert(reftable_calloc((uintmax_t)SIZE_MAX + 1, 1) == NULL);
}
}

void test_reftable_basics__alloc_grow(void)
{
int *arr = NULL, *old_arr;
Expand Down
Loading