Skip to content

C support lib allocation fixes #213

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

Merged
li-feng-sc merged 1 commit into from
Nov 27, 2025
Merged

C support lib allocation fixes #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions support-lib/cpp/djinni_c_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ constexpr size_t alignUp(size_t size, size_t alignment) {
}

template <typename T, typename ValueType> struct ArrayAllocator {
static constexpr size_t alignedValueSize = alignUp(sizeof(ValueType), alignof(ValueType));

template <typename... Args> static T *allocate(size_t size, Args &&...args) {
auto allocSize =
alignUp(sizeof(T), alignof(ValueType)) + (sizeof(ValueType) * size);
alignUp(sizeof(T), alignof(ValueType)) + (alignedValueSize * size);

auto *arrayRegion = ::operator new(allocSize);

Expand Down Expand Up @@ -69,7 +71,7 @@ const char *String::data() const {
size_t String::String::length() const { return _length; }

String *String::make(const char *str, size_t length) {
auto *output = StringAllocator::allocate(length, length);
auto *output = StringAllocator::allocate(length + 1, length);
auto *data = StringAllocator::getContainerStartPtr(output);
for (size_t i = 0; i < length; i++) {
data[i] = str[i];
Expand Down Expand Up @@ -110,7 +112,8 @@ void ObjectArray::setObjectAtIndex(size_t index, Object *object) {
ObjectArray *ObjectArray::make(size_t length) {
auto *output = ObjectArrayAllocator::allocate(length, length);

std::memset(ObjectArrayAllocator::getContainerStartPtr(output), 0, length);
std::memset(ObjectArrayAllocator::getContainerStartPtr(output), 0,
length * ObjectArrayAllocator::alignedValueSize);

return output;
}
Expand Down