Skip to content

interchange, repr: Prevent deep Protobuf and jsonb stack overflows #37582

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
def- wants to merge 7 commits into from
Closed

interchange, repr: Prevent deep Protobuf and jsonb stack overflows #37582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3de938a
interchange: Bound protobuf message nesting depth to avoid stack over…
def- Jul 10, 2026
73f74bb
repr: Grow the stack when recursing over deeply nested jsonb values
def- Jul 10, 2026
c14b280
interchange: Reject deeply nested descriptor sets before decoding
def- Jul 11, 2026
4ef3753
interchange: Make descriptor-set nesting scan schema-aware
def- Jul 11, 2026
4b03705
Address reviewer comments
def- Jul 14, 2026
79283c1
repr, interchange, storage: grow the stack in deep type recursion
def- Jul 16, 2026
1c1a39f
repr: grow the stack in deep type comparison, hashing, and formatting
def- Jul 17, 2026
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/expr/src/relation/func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2749,7 +2749,7 @@ impl AggregateFunc {
let nullable = match self {
AggregateFunc::Count => false,
// Use the nullability of the underlying column being aggregated, not the Records wrapping it
AggregateFunc::StringAgg { .. } => match input_type.scalar_type {
AggregateFunc::StringAgg { .. } => match &input_type.scalar_type {
// The outer Record wraps the input in the first position, and any ORDER BY expressions afterwards
SqlScalarType::Record { fields, .. } => match &fields[0].1.scalar_type {
// The inner Record is a (value, separator) tuple
Expand Down
2 changes: 1 addition & 1 deletion src/expr/src/scalar/func/impls/record.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ impl LazyUnaryFunc for RecordGet {
}

fn output_sql_type(&self, input_type: SqlColumnType) -> SqlColumnType {
match input_type.scalar_type {
match &input_type.scalar_type {
SqlScalarType::Record { fields, .. } => {
let (_name, ty) = &fields[self.0];
let mut ty = ty.clone();
Expand Down
3 changes: 2 additions & 1 deletion src/interchange/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ maplit.workspace = true
mz-avro = { path = "../avro", features = ["snappy"] }
mz-aws-glue-schema-registry = { path = "../aws-glue-schema-registry" }
mz-ccsr = { path = "../ccsr" }
mz-ore = { path = "../ore", features = ["network", "cli"] }
mz-ore = { path = "../ore", features = ["network", "cli", "stack"] }
mz-repr = { path = "../repr" }
mz-pgrepr = { path = "../pgrepr" }
ordered-float.workspace = true
Expand All @@ -42,6 +42,7 @@ uuid = { workspace = true, features = ["serde"] }

[dev-dependencies]
criterion.workspace = true
prost-types.workspace = true
tokio.workspace = true

[build-dependencies]
Expand Down
Loading
Loading