Skip to content

Make TensorPtr constructor check the data dize matches the shape. #13591

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
merged 1 commit into from
Aug 22, 2025
Merged

Make TensorPtr constructor check the data dize matches the shape. #13591

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions extension/tensor/tensor_ptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ TensorPtr make_tensor_ptr(
executorch::aten::ScalarType type,
executorch::aten::TensorShapeDynamism dynamism) {
ET_CHECK_MSG(
data.size() >=
data.size() ==
executorch::aten::compute_numel(sizes.data(), sizes.size()) *
executorch::aten::elementSize(type),
"Data size is smaller than required by sizes and scalar type.");
"Data size does not match tensor size.");
auto data_ptr = data.data();
return make_tensor_ptr(
std::move(sizes),
Expand Down
4 changes: 4 additions & 0 deletions extension/tensor/tensor_ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ inline TensorPtr make_tensor_ptr(
executorch::aten::ScalarType type = deduced_type,
executorch::aten::TensorShapeDynamism dynamism =
executorch::aten::TensorShapeDynamism::DYNAMIC_BOUND) {
ET_CHECK_MSG(
data.size() ==
executorch::aten::compute_numel(sizes.data(), sizes.size()),
"Data size does not match tensor size.");
if (type != deduced_type) {
ET_CHECK_MSG(
runtime::canCast(deduced_type, type),
Expand Down
30 changes: 22 additions & 8 deletions extension/tensor/test/tensor_ptr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,16 +784,30 @@ TEST_F(TensorPtrTest, TensorUint8BufferTooSmallExpectDeath) {
{ auto tensor = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, TensorUint8BufferTooLarge) {
TEST_F(TensorPtrTest, TensorUint8BufferTooLargeExpectDeath) {
std::vector<uint8_t> data(
4 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
auto tensor = make_tensor_ptr({2, 2}, std::move(data));
5 * executorch::aten::elementSize(executorch::aten::ScalarType::Float));
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 2}, std::move(data)); }, "");
}

EXPECT_EQ(tensor->dim(), 2);
EXPECT_EQ(tensor->size(0), 2);
EXPECT_EQ(tensor->size(1), 2);
EXPECT_EQ(tensor->strides()[0], 2);
EXPECT_EQ(tensor->strides()[1], 1);
TEST_F(TensorPtrTest, VectorFloatTooSmallExpectDeath) {
std::vector<float> data(9, 1.f);
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 5}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, VectorFloatTooLargeExpectDeath) {
std::vector<float> data(11, 1.f);
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 5}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, VectorIntToFloatCastTooSmallExpectDeath) {
std::vector<int32_t> data(9, 1);
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 5}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, VectorIntToFloatCastTooLargeExpectDeath) {
std::vector<int32_t> data(11, 1);
ET_EXPECT_DEATH({ auto _ = make_tensor_ptr({2, 5}, std::move(data)); }, "");
}

TEST_F(TensorPtrTest, StridesAndDimOrderMustMatchSizes) {
Expand Down
Loading