Merge pull request #37 from Stebalien/fix/scratch-map

Always allocate scratch space when marshalling into a map.
whyrusleeping · Aug 11, 2020 · d923275 · d923275
2 parents 211df3b + fdf2ae9
commit d923275
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 2 deletions.
diff --git a/gen.go b/gen.go
@@ -1085,9 +1085,8 @@ func emitCborMarshalStructMap(w io.Writer, gti *GenTypeInfo) error {
 	if _, err := w.Write({{ .MapHeaderAsByteString }}); err != nil {
 		return err
 	}
-{{ if .NeedsScratch }}
+
 	scratch := make([]byte, 9)
-{{ end }}
 `)
 	if err != nil {
 		return err

diff --git a/testgen/main.go b/testgen/main.go
@@ -18,6 +18,7 @@ func main() {
 
 	if err := cbg.WriteMapEncodersToFile("testing/cbor_map_gen.go", "testing",
 		types.SimpleTypeTree{},
+		types.NeedScratchForMap{},
 	); err != nil {
 		panic(err)
 	}

diff --git a/testing/cbor_map_gen.go b/testing/cbor_map_gen.go
diff --git a/testing/roundtrip_test.go b/testing/roundtrip_test.go
@@ -37,6 +37,10 @@ func TestSimpleTypeTree(t *testing.T) {
 	testTypeRoundtrips(t, reflect.TypeOf(SimpleTypeTree{}))
 }
 
+func TestNeedScratchForMap(t *testing.T) {
+	testTypeRoundtrips(t, reflect.TypeOf(NeedScratchForMap{}))
+}
+
 func testValueRoundtrip(t *testing.T, obj cbg.CBORMarshaler, nobj cbg.CBORUnmarshaler) {
 
 	buf := new(bytes.Buffer)

diff --git a/testing/types.go b/testing/types.go
@@ -54,3 +54,8 @@ type FixedArrays struct {
 	Uint8  [20]uint8
 	Uint64 [20]uint64
 }
+
+// Do not add fields to this type.
+type NeedScratchForMap struct {
+	Thing bool
+}