sql: Fix crash inside crdb_internal.tenant_span_stats

fqazi · fqazi · commit b81f3de7eccb · 2023-07-21T11:37:29.000-04:00
Previously, crdb_internal.tenant_span_stats would crash if the number of arguments were incorrect. This patch, adds a check for the parameter count. Fixes: cockroachdb#99182 Release note: None
diff --git a/pkg/sql/sem/builtins/generator_builtins.go b/pkg/sql/sem/builtins/generator_builtins.go
@@ -3314,7 +3314,7 @@ func makeSpanStatsGenerator(
 	spans := make([]roachpb.Span, 0, argSpans.Len())
 	for _, span := range argSpans.Array {
 		s := tree.MustBeDTuple(span)
-		if s.D[0] == tree.DNull || s.D[1] == tree.DNull {
+		if len(s.D) != 2 || s.D[0] == tree.DNull || s.D[1] == tree.DNull {
 			continue
 		}
 		startKey := roachpb.Key(tree.MustBeDBytes(s.D[0]))

Original file line number	Diff line number	Diff line change
`@@ -3314,7 +3314,7 @@ func makeSpanStatsGenerator(`
`3314`	`3314`	`spans := make([]roachpb.Span, 0, argSpans.Len())`
`3315`	`3315`	`for _, span := range argSpans.Array {`
`3316`	`3316`	`s := tree.MustBeDTuple(span)`
`3317`		`- if s.D[0] == tree.DNull \|\| s.D[1] == tree.DNull {`
	`3317`	`+ if len(s.D) != 2 \|\| s.D[0] == tree.DNull \|\| s.D[1] == tree.DNull {`
`3318`	`3318`	`continue`
`3319`	`3319`	`}`
`3320`	`3320`	`startKey := roachpb.Key(tree.MustBeDBytes(s.D[0]))`