Ensure uninitialized map is initialized when unmarshaling json

Add tests for this scenario
gobuffalo · Dec 15, 2020 · 4d0d826 · 4d0d826
1 parent f36afb5
commit 4d0d826
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/slices/map.go b/slices/map.go
@@ -51,6 +51,9 @@ func (m Map) UnmarshalJSON(b []byte) error {
 	if err != nil {
 		return err
 	}
+	if m == nil {
+		m = Map{}
+	}
 	for key, value := range stuff {
 		m[key] = value
 	}

diff --git a/slices/map_test.go b/slices/map_test.go
@@ -24,3 +24,14 @@ func Test_Map_MarshalJSON(t *testing.T) {
 	r.NoError(err)
 	r.Equal([]byte(`{"a":"b"}`), b)
 }
+
+func Test_Map_UnMarshalJSON_uninitialized_map_does_not_panic(t *testing.T) {
+	r := require.New(t)
+
+	maps := make([]Map, 0)
+	r.NotPanics(func() {
+		err := json.Unmarshal([]byte(`[{"a": "b"}]`), &maps)
+		r.NoError(err)
+		r.Len(maps, 1)
+	})
+}