diff --git a/bencode_test.go b/bencode_test.go index a4d222e..c006711 100644 --- a/bencode_test.go +++ b/bencode_test.go @@ -255,7 +255,7 @@ func TestUnmarshal(t *testing.T) { SVPair{"l3:abc3:defe", []string{"abc", "def"}}, SVPair{"li42e3:abce", []any{42, "abc"}}, SVPair{"de", map[string]any{}}, - //SVPair{"d3:cati1e3:dogi2ee", map[string]any{"cat": 1, "dog": 2}}, + SVPair{"d3:cati1e3:dogi2ee", map[string]any{"cat": 1, "dog": 2}}, SVPair{"d1:ai10e1:b3:fooe", structA{10, "foo"}}, SVPair{"d1:ad2:id20:abcdefghij0123456789e1:q4:ping1:t2:aa1:y1:qe", nestedDictionary}, } diff --git a/struct.go b/struct.go index b850480..0290d65 100644 --- a/struct.go +++ b/struct.go @@ -72,6 +72,10 @@ func (b *structBuilder) Int64(i int64) { if b == nil { return } + if !b.val.CanSet() { + x := 0 + b.val = reflect.ValueOf(&x).Elem() + } v := b.val if isfloat(v) { setfloat(v, float64(i)) @@ -84,6 +88,10 @@ func (b *structBuilder) Uint64(i uint64) { if b == nil { return } + if !b.val.CanSet() { + x := uint64(0) + b.val = reflect.ValueOf(&x).Elem() + } v := b.val if isfloat(v) { setfloat(v, float64(i)) @@ -96,6 +104,10 @@ func (b *structBuilder) Float64(f float64) { if b == nil { return } + if !b.val.CanSet() { + x := float64(0) + b.val = reflect.ValueOf(&x).Elem() + } v := b.val if isfloat(v) { setfloat(v, f) @@ -169,7 +181,7 @@ func (b *structBuilder) Map() { if b == nil { return } - if v := b.val; v.Kind() == reflect.Ptr && v.IsNil() { + if v := b.val; v.Kind() == reflect.Ptr { if v.IsNil() { v.Set(reflect.Zero(v.Type().Elem()).Addr()) b.Flush()