Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions decode_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ func (d *Decoder) mapLen(c byte) (int, error) {
}

func decodeMapStringStringValue(d *Decoder, v reflect.Value) error {
mptr := v.Addr().Convert(mapStringStringPtrType).Interface().(*map[string]string)
var mptr *map[string]string
if v.Type() == mapStringStringType {
mptr = v.Addr().Interface().(*map[string]string)
} else {
mptr = v.Addr().Convert(mapStringStringPtrType).Interface().(*map[string]string)
}
return d.decodeMapStringStringPtr(mptr)
}

Expand Down Expand Up @@ -154,7 +159,12 @@ func (d *Decoder) decodeMapStringStringPtr(ptr *map[string]string) error {
}

func decodeMapStringInterfaceValue(d *Decoder, v reflect.Value) error {
ptr := v.Addr().Convert(mapStringInterfacePtrType).Interface().(*map[string]interface{})
var ptr *map[string]interface{}
if v.Type() == mapStringInterfaceType {
ptr = v.Addr().Interface().(*map[string]interface{})
} else {
ptr = v.Addr().Convert(mapStringInterfacePtrType).Interface().(*map[string]interface{})
}
return d.decodeMapStringInterfacePtr(ptr)
}

Expand Down
12 changes: 10 additions & 2 deletions decode_slice.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ import (
"github.com/vmihailenco/msgpack/v5/msgpcode"
)

var sliceStringPtrType = reflect.TypeOf((*[]string)(nil))
var (
sliceStringPtrType = reflect.TypeOf((*[]string)(nil))
sliceStringType = sliceStringPtrType.Elem()
)

// DecodeArrayLen decodes array length. Length is -1 when array is nil.
func (d *Decoder) DecodeArrayLen() (int, error) {
Expand Down Expand Up @@ -36,7 +39,12 @@ func (d *Decoder) arrayLen(c byte) (int, error) {
}

func decodeStringSliceValue(d *Decoder, v reflect.Value) error {
ptr := v.Addr().Convert(sliceStringPtrType).Interface().(*[]string)
var ptr *[]string
if v.Type() == sliceStringType {
ptr = v.Addr().Interface().(*[]string)
} else {
ptr = v.Addr().Convert(sliceStringPtrType).Interface().(*[]string)
}
return d.decodeStringSlicePtr(ptr)
}

Expand Down
21 changes: 18 additions & 3 deletions encode_map.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ func encodeMapStringBoolValue(e *Encoder, v reflect.Value) error {
return err
}

m := v.Convert(mapStringBoolType).Interface().(map[string]bool)
var m map[string]bool
if v.Type() == mapStringBoolType {
m = v.Interface().(map[string]bool)
} else {
m = v.Convert(mapStringBoolType).Interface().(map[string]bool)
}
if e.flags&sortMapKeysFlag != 0 {
return e.encodeSortedMapStringBool(m)
}
Expand All @@ -65,7 +70,12 @@ func encodeMapStringStringValue(e *Encoder, v reflect.Value) error {
return err
}

m := v.Convert(mapStringStringType).Interface().(map[string]string)
var m map[string]string
if v.Type() == mapStringStringType {
m = v.Interface().(map[string]string)
} else {
m = v.Convert(mapStringStringType).Interface().(map[string]string)
}
if e.flags&sortMapKeysFlag != 0 {
return e.encodeSortedMapStringString(m)
}
Expand All @@ -86,7 +96,12 @@ func encodeMapStringInterfaceValue(e *Encoder, v reflect.Value) error {
if v.IsNil() {
return e.EncodeNil()
}
m := v.Convert(mapStringInterfaceType).Interface().(map[string]interface{})
var m map[string]interface{}
if v.Type() == mapStringInterfaceType {
m = v.Interface().(map[string]interface{})
} else {
m = v.Convert(mapStringInterfaceType).Interface().(map[string]interface{})
}
if e.flags&sortMapKeysFlag != 0 {
return e.EncodeMapSorted(m)
}
Expand Down
7 changes: 6 additions & 1 deletion encode_slice.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,12 @@ func (e *Encoder) EncodeArrayLen(l int) error {
}

func encodeStringSliceValue(e *Encoder, v reflect.Value) error {
ss := v.Convert(stringSliceType).Interface().([]string)
var ss []string
if v.Type() == stringSliceType {
ss = v.Interface().([]string)
} else {
ss = v.Convert(stringSliceType).Interface().([]string)
}
return e.encodeStringSlice(ss)
}

Expand Down