tree: fix panic when encoding tuple

This adds a bounds check to avoid a panic. Release note (bug fix): Fixed a crash that could happen when formatting a tuple with an unknown type.
cockroachdb · Jan 10, 2023 · 9cc6a9e · 9cc6a9e
1 parent 6753f7f
commit 9cc6a9e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/sql/sem/tree/pgwire_encode.go b/pkg/sql/sem/tree/pgwire_encode.go
@@ -49,7 +49,10 @@ func (d *DTuple) pgwireFormat(ctx *FmtCtx) {
 	comma := ""
 	for i, v := range d.D {
 		ctx.WriteString(comma)
-		t := d.ResolvedType().TupleContents()[i]
+		t := v.ResolvedType()
+		if tc := d.ResolvedType().TupleContents(); i < len(tc) {
+			t = tc[i]
+		}
 		switch dv := UnwrapDOidWrapper(v).(type) {
 		case dNull:
 		case *DString: