Merge pull request #101 from brianolson/fix-str-ptr-slice

fix handling of an []*string field

Author: whyrusleeping

gen.go

@@ -1372,9 +1372,10 @@ func (g Gen) emitCborUnmarshalSliceField(w io.Writer, f Field) error {
 
 	case reflect.String:
 		subf := Field{
-			Type: e,
-			Pkg:  f.Pkg,
-			Name: f.Name + "[" + f.IterLabel + "]",
+			Type:    e,
+			Pkg:     f.Pkg,
+			Pointer: pointer,
+			Name:    f.Name + "[" + f.IterLabel + "]",
 		}
 		err := g.emitCborUnmarshalStringField(w, subf)
 		if err != nil {

testgen/main.go

@@ -37,6 +37,7 @@ func main() {
 		types.TestCanonicalFieldOrder{},
 		types.MapStringString{},
 		types.TestSliceNilPreserve{},
+		types.StringPtrSlices{},
 	); err != nil {
 		panic(err)
 	}

testing/cbor_map_gen.go

@@ -770,6 +770,22 @@ func TestOptionalInts(t *testing.T) {
 	testValueRoundtrip(t, val, recepticle, WithGolden([]byte{0x84, 0xf6, 0x02, 0x03, 0xf6}))
 }
 
+func TestStringPtrSlices(t *testing.T) {
+	foo := "foo"
+	bar := "bar"
+	ob := StringPtrSlices{
+		Strings: []string{
+			"a", "b", "c",
+		},
+		StringPtrs: []*string{
+			&foo, nil, &bar,
+		},
+	}
+	ob2 := StringPtrSlices{}
+
+	testValueRoundtrip(t, &ob, &ob2)
+}
+
 func ptr[T any](v T) *T {
 	return &v
 }

testing/roundtrip_test.go

@@ -199,3 +199,8 @@ func (ls LongString) Generate(rand *rand.Rand, size int) reflect.Value {
 type BigIntContainer struct {
 	Int *big.Int
 }
+
+type StringPtrSlices struct {
+	Strings    []string
+	StringPtrs []*string
+}