Skip to content

GH-48062: [C++] Fix null pointer dereference in MakeExecBatch #48063

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

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

GH-48062: [C++] Fix null pointer dereference in MakeExecBatch #48063

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
3 changes: 2 additions & 1 deletion cpp/src/arrow/compute/expression.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,8 @@ Result<ExecBatch> MakeExecBatch(const Schema& full_schema, const Datum& partial,
}

// wasteful but useful for testing:
if (partial.type()->id() == Type::STRUCT) {
const auto& partial_type = partial.type();
if (partial_type && partial_type->id() == Type::STRUCT) {
if (partial.is_array()) {
ARROW_ASSIGN_OR_RAISE(auto partial_batch,
RecordBatch::FromStructArray(partial.make_array()));
Expand Down
3 changes: 3 additions & 0 deletions cpp/src/arrow/compute/expression_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ TEST(ExpressionUtils, MakeExecBatch) {
auto duplicated_names =
RecordBatch::Make(schema({GetField("i32"), GetField("i32")}), kNumRows, {i32, i32});
ASSERT_RAISES(Invalid, MakeExecBatch(*kBoringSchema, duplicated_names));

ASSERT_OK_AND_ASSIGN(auto boring_table, Table::MakeEmpty(kBoringSchema));
ASSERT_RAISES(NotImplemented, MakeExecBatch(*kBoringSchema, boring_table));
}

class WidgetifyOptions : public compute::FunctionOptions {
Expand Down