Skip to content

ARROW-9373: [C++] Fix Parquet crash on invalid input (OSS-Fuzz) #7682

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

Closed
pitrou wants to merge 1 commit into from
Closed

ARROW-9373: [C++] Fix Parquet crash on invalid input (OSS-Fuzz) #7682

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
34 changes: 26 additions & 8 deletions cpp/src/parquet/schema.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ namespace parquet {

namespace schema {

namespace {

void ThrowInvalidLogicalType(const LogicalType& logical_type) {
std::stringstream ss;
ss << "Invalid logical type: " << logical_type.ToString();
throw ParquetException(ss.str());
}

} // namespace

// ----------------------------------------------------------------------
// ColumnPath

Expand Down Expand Up @@ -206,8 +216,10 @@ PrimitiveNode::PrimitiveNode(const std::string& name, Repetition::type repetitio
}
// For forward compatibility, create an equivalent logical type
logical_type_ = LogicalType::FromConvertedType(converted_type_, decimal_metadata_);
DCHECK(logical_type_ && !logical_type_->is_nested() &&
logical_type_->is_compatible(converted_type_, decimal_metadata_));
if (!(logical_type_ && !logical_type_->is_nested() &&
logical_type_->is_compatible(converted_type_, decimal_metadata_))) {
ThrowInvalidLogicalType(*logical_type_);
}

if (type == Type::FIXED_LEN_BYTE_ARRAY) {
if (length <= 0) {
Expand Down Expand Up @@ -249,8 +261,10 @@ PrimitiveNode::PrimitiveNode(const std::string& name, Repetition::type repetitio
logical_type_ = NoLogicalType::Make();
converted_type_ = logical_type_->ToConvertedType(&decimal_metadata_);
}
DCHECK(logical_type_ && !logical_type_->is_nested() &&
logical_type_->is_compatible(converted_type_, decimal_metadata_));
if (!(logical_type_ && !logical_type_->is_nested() &&
logical_type_->is_compatible(converted_type_, decimal_metadata_))) {
ThrowInvalidLogicalType(*logical_type_);
}

if (physical_type == Type::FIXED_LEN_BYTE_ARRAY) {
if (physical_length <= 0) {
Expand Down Expand Up @@ -296,8 +310,10 @@ GroupNode::GroupNode(const std::string& name, Repetition::type repetition,
: Node(Node::GROUP, name, repetition, converted_type, id), fields_(fields) {
// For forward compatibility, create an equivalent logical type
logical_type_ = LogicalType::FromConvertedType(converted_type_);
DCHECK(logical_type_ && (logical_type_->is_nested() || logical_type_->is_none()) &&
logical_type_->is_compatible(converted_type_));
if (!(logical_type_ && (logical_type_->is_nested() || logical_type_->is_none()) &&
logical_type_->is_compatible(converted_type_))) {
ThrowInvalidLogicalType(*logical_type_);
}

field_name_to_idx_.clear();
auto field_idx = 0;
Expand Down Expand Up @@ -327,8 +343,10 @@ GroupNode::GroupNode(const std::string& name, Repetition::type repetition,
logical_type_ = NoLogicalType::Make();
converted_type_ = logical_type_->ToConvertedType(nullptr);
}
DCHECK(logical_type_ && (logical_type_->is_nested() || logical_type_->is_none()) &&
logical_type_->is_compatible(converted_type_));
if (!(logical_type_ && (logical_type_->is_nested() || logical_type_->is_none()) &&
logical_type_->is_compatible(converted_type_))) {
ThrowInvalidLogicalType(*logical_type_);
}

field_name_to_idx_.clear();
auto field_idx = 0;
Expand Down
2 changes: 1 addition & 1 deletion testing
Open in desktop
Submodule testing updated 1 files
+ − data/parquet/fuzzing/clusterfuzz-testcase-minimized-parquet-arrow-fuzz-5362519066279936