From ae67a45a1cee839d5aada1b3116e9a274937b692 Mon Sep 17 00:00:00 2001
From: Andrei Matei <andreimatei1@gmail.com>
Date: Mon, 7 Aug 2023 15:11:05 -0400
Subject: [PATCH] starbind: fix Starlark slice unmarshaling (#3454)

The unmarshaling code for slices wasn't actually setting the
destination. This patch fixes it.
---
 pkg/terminal/starbind/conv.go      |  3 ++-
 pkg/terminal/starbind/conv_test.go | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkg/terminal/starbind/conv_test.go

diff --git a/pkg/terminal/starbind/conv.go b/pkg/terminal/starbind/conv.go
index 972ebbc717..b421e15191 100644
--- a/pkg/terminal/starbind/conv.go
+++ b/pkg/terminal/starbind/conv.go
@@ -664,8 +664,9 @@ func unmarshalStarlarkValueIntl(val starlark.Value, dst reflect.Value, path stri
 		if dst.Kind() != reflect.Slice {
 			return converr()
 		}
+		dst.Set(reflect.MakeSlice(dst.Type(), val.Len(), val.Len()))
 		for i := 0; i < val.Len(); i++ {
-			cur := reflect.New(dst.Type().Elem())
+			cur := dst.Index(i).Addr()
 			err := unmarshalStarlarkValueIntl(val.Index(i), cur, path)
 			if err != nil {
 				return err
diff --git a/pkg/terminal/starbind/conv_test.go b/pkg/terminal/starbind/conv_test.go
new file mode 100644
index 0000000000..34c613aa29
--- /dev/null
+++ b/pkg/terminal/starbind/conv_test.go
@@ -0,0 +1,29 @@
+package starbind
+
+import (
+	"go.starlark.net/starlark"
+	"testing"
+)
+
+func TestConv(t *testing.T) {
+	script := `
+# A list global that we'll unmarhsal into a slice.
+x = [1,2]
+`
+	globals, err := starlark.ExecFile(&starlark.Thread{}, "test.star", script, nil)
+	starlarkVal, ok := globals["x"]
+	if !ok {
+		t.Fatal("missing global 'x'")
+	}
+	if err != nil {
+		t.Fatal(err)
+	}
+	var x []int
+	err = unmarshalStarlarkValue(starlarkVal, &x, "x")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(x) != 2 || x[0] != 1 || x[1] != 2 {
+		t.Fatalf("expected [1 2], got: %v", x)
+	}
+}