kou commented on code in PR #49718:
URL: https://github.com/apache/arrow/pull/49718#discussion_r3076516188
##########
cpp/src/arrow/extension/fixed_shape_tensor.cc:
##########
@@ -119,29 +120,61 @@ Result<std::shared_ptr<DataType>>
FixedShapeTensorType::Deserialize(
}
std::vector<int64_t> shape;
- for (auto& x : document["shape"].GetArray()) {
+ for (const auto& x : document["shape"].GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("shape must contain integers");
Review Comment:
Can we show the actual type for easy to debug on failure?
##########
cpp/src/arrow/extension/fixed_shape_tensor.cc:
##########
@@ -119,29 +120,61 @@ Result<std::shared_ptr<DataType>>
FixedShapeTensorType::Deserialize(
}
std::vector<int64_t> shape;
- for (auto& x : document["shape"].GetArray()) {
+ for (const auto& x : document["shape"].GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("shape must contain integers");
+ }
shape.emplace_back(x.GetInt64());
}
+
std::vector<int64_t> permutation;
if (document.HasMember("permutation")) {
- for (auto& x : document["permutation"].GetArray()) {
+ const auto& json_permutation = document["permutation"];
+ if (!json_permutation.IsArray()) {
+ return Status::Invalid("permutation must be an array");
+ }
+ for (const auto& x : json_permutation.GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("permutation must contain integers");
+ }
permutation.emplace_back(x.GetInt64());
}
if (shape.size() != permutation.size()) {
return Status::Invalid("Invalid permutation");
}
+ RETURN_NOT_OK(internal::IsPermutationValid(permutation));
}
std::vector<std::string> dim_names;
if (document.HasMember("dim_names")) {
- for (auto& x : document["dim_names"].GetArray()) {
+ const auto& json_dim_names = document["dim_names"];
+ if (!json_dim_names.IsArray()) {
+ return Status::Invalid("dim_names must be an array");
Review Comment:
ditto.
##########
cpp/src/arrow/extension/fixed_shape_tensor.cc:
##########
@@ -119,29 +120,61 @@ Result<std::shared_ptr<DataType>>
FixedShapeTensorType::Deserialize(
}
std::vector<int64_t> shape;
- for (auto& x : document["shape"].GetArray()) {
+ for (const auto& x : document["shape"].GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("shape must contain integers");
+ }
shape.emplace_back(x.GetInt64());
}
+
std::vector<int64_t> permutation;
if (document.HasMember("permutation")) {
- for (auto& x : document["permutation"].GetArray()) {
+ const auto& json_permutation = document["permutation"];
+ if (!json_permutation.IsArray()) {
+ return Status::Invalid("permutation must be an array");
+ }
+ for (const auto& x : json_permutation.GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("permutation must contain integers");
+ }
permutation.emplace_back(x.GetInt64());
}
if (shape.size() != permutation.size()) {
return Status::Invalid("Invalid permutation");
}
+ RETURN_NOT_OK(internal::IsPermutationValid(permutation));
}
std::vector<std::string> dim_names;
if (document.HasMember("dim_names")) {
- for (auto& x : document["dim_names"].GetArray()) {
+ const auto& json_dim_names = document["dim_names"];
+ if (!json_dim_names.IsArray()) {
+ return Status::Invalid("dim_names must be an array");
+ }
+ for (const auto& x : json_dim_names.GetArray()) {
+ if (!x.IsString()) {
+ return Status::Invalid("dim_names must contain strings");
Review Comment:
ditto.
##########
cpp/src/arrow/extension/fixed_shape_tensor.cc:
##########
@@ -119,29 +120,61 @@ Result<std::shared_ptr<DataType>>
FixedShapeTensorType::Deserialize(
}
std::vector<int64_t> shape;
- for (auto& x : document["shape"].GetArray()) {
+ for (const auto& x : document["shape"].GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("shape must contain integers");
+ }
shape.emplace_back(x.GetInt64());
}
+
std::vector<int64_t> permutation;
if (document.HasMember("permutation")) {
- for (auto& x : document["permutation"].GetArray()) {
+ const auto& json_permutation = document["permutation"];
+ if (!json_permutation.IsArray()) {
+ return Status::Invalid("permutation must be an array");
Review Comment:
ditto.
##########
cpp/src/arrow/extension/fixed_shape_tensor.cc:
##########
@@ -119,29 +120,61 @@ Result<std::shared_ptr<DataType>>
FixedShapeTensorType::Deserialize(
}
std::vector<int64_t> shape;
- for (auto& x : document["shape"].GetArray()) {
+ for (const auto& x : document["shape"].GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("shape must contain integers");
+ }
shape.emplace_back(x.GetInt64());
}
+
std::vector<int64_t> permutation;
if (document.HasMember("permutation")) {
- for (auto& x : document["permutation"].GetArray()) {
+ const auto& json_permutation = document["permutation"];
+ if (!json_permutation.IsArray()) {
+ return Status::Invalid("permutation must be an array");
+ }
+ for (const auto& x : json_permutation.GetArray()) {
+ if (!x.IsInt64()) {
+ return Status::Invalid("permutation must contain integers");
Review Comment:
ditto.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
