Merge pull request #359 from choyri/bugfix/reflect-set

fix(reflect): not assignable to type
vmihailenco · Oct 26, 2023 · 6eedee3 · 6eedee3
2 parents 3f7bd80 + edeaedd
commit 6eedee3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/decode_value.go b/decode_value.go
@@ -128,7 +128,7 @@ func ptrValueDecoder(typ reflect.Type) decoderFunc {
 	return func(d *Decoder, v reflect.Value) error {
 		if d.hasNilCode() {
 			if !v.IsNil() {
-				v.Set(d.newValue(typ))
+				v.Set(reflect.Zero(v.Type()))
 			}
 			return d.DecodeNil()
 		}

diff --git a/msgpack_test.go b/msgpack_test.go
@@ -528,3 +528,28 @@ func TestEncodeWrappedValue(t *testing.T) {
 	require.Nil(t, msgpack.NewEncoder(&buf).Encode(v))
 	require.Nil(t, msgpack.NewEncoder(&buf).Encode(c))
 }
+
+func TestPtrValueDecode(t *testing.T) {
+	type Foo struct {
+		Bar *int
+	}
+
+	b, err := msgpack.Marshal(Foo{})
+	require.Nil(t, err)
+
+	bar1 := 123
+	foo := Foo{Bar: &bar1}
+
+	err = msgpack.Unmarshal(b, &foo)
+	require.Nil(t, err)
+	require.Nil(t, foo.Bar)
+
+	bar2 := 456
+	b, err = msgpack.Marshal(Foo{Bar: &bar2})
+	require.Nil(t, err)
+
+	err = msgpack.Unmarshal(b, &foo)
+	require.Nil(t, err)
+	require.NotNil(t, foo.Bar)
+	require.Equal(t, *foo.Bar, bar2)
+}