Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions src/nanoarrow/common/array_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1193,6 +1193,30 @@ TEST(ArrayTest, ArrayTestAppendToStringViewArray) {
});
};

TEST(ArrayTest, ArrayTestAppendNullDataToViewArray) {
for (enum ArrowType arrow_type :
{NANOARROW_TYPE_BINARY_VIEW, NANOARROW_TYPE_STRING_VIEW}) {
SCOPED_TRACE(ArrowTypeString(arrow_type));
nanoarrow::UniqueArray array;
ASSERT_EQ(ArrowArrayInitFromType(array.get(), arrow_type), NANOARROW_OK);
ASSERT_EQ(ArrowArrayStartAppending(array.get()), NANOARROW_OK);

// Empty buffer and string views may have a null data pointer.
// Run with UBSan to detect passing these pointers to memcpy, even with size 0.
ASSERT_EQ(ArrowArrayAppendBytes(array.get(), {{nullptr}, 0}), NANOARROW_OK);
ASSERT_EQ(ArrowArrayAppendString(array.get(), ArrowCharView(nullptr)), NANOARROW_OK);
ASSERT_EQ(ArrowArrayFinishBuildingDefault(array.get(), nullptr), NANOARROW_OK);

EXPECT_EQ(array->length, 2);
EXPECT_EQ(array->null_count, 0);
auto inline_buffer =
reinterpret_cast<const union ArrowBinaryView*>(array->buffers[1]);
for (int64_t i = 0; i < array->length; i++) {
EXPECT_EQ(inline_buffer[i].inlined.size, 0);
}
}
}

TEST(ArrayTest, ArrayTestAppendToFixedSizeBinaryArray) {
struct ArrowArray array;
struct ArrowSchema schema;
Expand Down
4 changes: 3 additions & 1 deletion src/nanoarrow/common/inline_array.h
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,9 @@ static inline ArrowErrorCode ArrowArrayAppendBytes(struct ArrowArray* array,
bvt.inlined.size = (int32_t)value.size_bytes;

if (value.size_bytes <= NANOARROW_BINARY_VIEW_INLINE_SIZE) {
memcpy(bvt.inlined.data, value.data.as_char, value.size_bytes);
if (value.size_bytes > 0) {
memcpy(bvt.inlined.data, value.data.as_char, value.size_bytes);
}
memset(bvt.inlined.data + bvt.inlined.size, 0,
NANOARROW_BINARY_VIEW_INLINE_SIZE - bvt.inlined.size);
} else {
Expand Down
Loading