diff --git a/src/nanoarrow/common/array_test.cc b/src/nanoarrow/common/array_test.cc index 520f6df9d..879e67ed3 100644 --- a/src/nanoarrow/common/array_test.cc +++ b/src/nanoarrow/common/array_test.cc @@ -1267,6 +1267,19 @@ TEST(ArrayTest, ArrayTestAppendToBinaryArrayErrors) { ArrowArrayRelease(&array); } +TEST(ArrayTest, ArrayTestAppendToBinaryViewArrayErrors) { + struct ArrowArray array; + + ASSERT_EQ(ArrowArrayInitFromType(&array, NANOARROW_TYPE_BINARY_VIEW), NANOARROW_OK); + EXPECT_EQ(ArrowArrayStartAppending(&array), NANOARROW_OK); + struct ArrowBufferView item; + item.data.as_char = ""; + item.size_bytes = static_cast(INT32_MAX) + 1; + EXPECT_EQ(ArrowArrayAppendBytes(&array, item), EOVERFLOW); + + ArrowArrayRelease(&array); +} + TEST(ArrayTest, ArrayTestAppendToIntervalArrayYearMonth) { struct ArrowArray array; diff --git a/src/nanoarrow/common/inline_array.h b/src/nanoarrow/common/inline_array.h index 9bfc6dbda..eaec776e0 100644 --- a/src/nanoarrow/common/inline_array.h +++ b/src/nanoarrow/common/inline_array.h @@ -584,6 +584,10 @@ static inline ArrowErrorCode ArrowArrayAppendBytes(struct ArrowArray* array, if (private_data->storage_type == NANOARROW_TYPE_STRING_VIEW || private_data->storage_type == NANOARROW_TYPE_BINARY_VIEW) { + if (value.size_bytes > INT32_MAX) { + return EOVERFLOW; + } + struct ArrowBuffer* data_buffer = ArrowArrayBuffer(array, 1); union ArrowBinaryView bvt; bvt.inlined.size = (int32_t)value.size_bytes;