diff options
author | Qyriad <qyriad@qyriad.me> | 2024-07-16 09:32:03 -0600 |
---|---|---|
committer | Qyriad <qyriad@qyriad.me> | 2024-07-20 20:20:01 +0000 |
commit | 72ee25b4025257fdaab7b8e8d5d1ccc83858fdab (patch) | |
tree | f2bc182d76deeec662c407647069348af4bf2331 /src/libexpr/gc-alloc.hh | |
parent | e67dac1d7493741cf88b411f68e31fc496179bf2 (diff) |
libexpr: add a strongly typed version of gcAllocBytes()
This commit adds a new helper template function to gc-alloc.hh (which is
probably where you want to look at first, O great reviewer [custom file
ordering in review diffs when]), which uses a type argument to determine
the size to allocate, rather than making the caller use sizeof().
Change-Id: Ib5d138d91a28bdda304a80db24ea9fb08669ad22
Diffstat (limited to 'src/libexpr/gc-alloc.hh')
-rw-r--r-- | src/libexpr/gc-alloc.hh | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/libexpr/gc-alloc.hh b/src/libexpr/gc-alloc.hh index f691bfc4b..04ac28ea8 100644 --- a/src/libexpr/gc-alloc.hh +++ b/src/libexpr/gc-alloc.hh @@ -18,6 +18,8 @@ #include <gc/gc_allocator.h> #include <gc/gc_cpp.h> +#include "checked-arithmetic.hh" + /// calloc, transparently GC-enabled. #define LIX_GC_CALLOC(size) GC_MALLOC(size) @@ -104,6 +106,30 @@ inline void * gcAllocBytes(size_t n) return ptr; } +/// Typed, safe wrapper around calloc() (transparently GC-enabled). Allocates +/// enough for the requested count of the specified type. Also checks for +/// nullptr (and throws @ref std::bad_alloc), and casts the void pointer to +/// a pointer of the specified type, for type-convenient goodness. +template<typename T> +[[gnu::always_inline]] +inline T * gcAllocType(size_t howMany = 1) +{ + // NOTE: size_t * size_t, which can definitely overflow. + // Unsigned integer overflow is definitely a bug, but isn't undefined + // behavior, so we can just check if we overflowed after the fact. + // However, people can and do request zero sized allocations, so we need + // to check that neither of our multiplicands were zero before complaining + // about it. + auto checkedSz = checked::Checked<size_t>(howMany) * sizeof(T); + size_t sz = checkedSz.valueWrapping(); + if (checkedSz.overflowed()) { + // Congrats, you done did an overflow. + throw std::bad_alloc(); + } + + return static_cast<T *>(gcAllocBytes(sz)); +} + /// GC-transparently allocates a buffer for a C-string of @ref size *bytes*, /// meaning you should include the size needed by the NUL terminator in the /// passed size. Memory allocated with this function must never contain other |