Skip to content

Validate non-null data pointer in Tensor accessors #19269

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

Draft
rascani wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Validate non-null data pointer in Tensor accessors #19269

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
25 changes: 25 additions & 0 deletions runtime/core/portable_type/tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#pragma once

#include <executorch/runtime/platform/assert.h>
#include <executorch/runtime/platform/compiler.h>

#include <executorch/runtime/core/portable_type/tensor_impl.h>
Expand Down Expand Up @@ -118,33 +119,57 @@ class Tensor {
/// Returns a pointer of type T to the constant underlying data blob.
template <typename T>
inline const T* const_data_ptr() const {
ET_CHECK_MSG(
numel() == 0 || impl_->data() != nullptr,
"Tensor has non-zero numel (%zd) but null data pointer",
(ssize_t)numel());
return impl_->data<T>();
}

/// Returns a pointer to the constant underlying data blob.
inline const void* const_data_ptr() const {
ET_CHECK_MSG(
numel() == 0 || impl_->data() != nullptr,
"Tensor has non-zero numel (%zd) but null data pointer",
(ssize_t)numel());
return impl_->data();
}

/// Returns a pointer of type T to the mutable underlying data blob.
template <typename T>
inline T* mutable_data_ptr() const {
ET_CHECK_MSG(
numel() == 0 || impl_->data() != nullptr,
"Tensor has non-zero numel (%zd) but null data pointer",
(ssize_t)numel());
return impl_->mutable_data<T>();
}

/// Returns a pointer to the mutable underlying data blob.
inline void* mutable_data_ptr() const {
ET_CHECK_MSG(
numel() == 0 || impl_->data() != nullptr,
"Tensor has non-zero numel (%zd) but null data pointer",
(ssize_t)numel());
return impl_->mutable_data();
}

/// DEPRECATED: Use const_data_ptr or mutable_data_ptr instead.
template <typename T>
ET_DEPRECATED inline T* data_ptr() const {
ET_CHECK_MSG(
numel() == 0 || impl_->data() != nullptr,
"Tensor has non-zero numel (%zd) but null data pointer",
(ssize_t)numel());
return impl_->mutable_data<T>();
}

/// DEPRECATED: Use const_data_ptr or mutable_data_ptr instead.
ET_DEPRECATED inline void* data_ptr() const {
ET_CHECK_MSG(
numel() == 0 || impl_->data() != nullptr,
"Tensor has non-zero numel (%zd) but null data pointer",
(ssize_t)numel());
return impl_->mutable_data();
}

Expand Down
Loading