Skip to content

fix issue 26 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2020
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
6 changes: 3 additions & 3 deletions json/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func constructCodec(t reflect.Type, seen map[reflect.Type]*structType, canAddr b
c = codec{encode: encoder.encodeString, decode: decoder.decodeString}

case reflect.Interface:
c = codec{encode: encoder.encodeInterface, decode: constructNonEmptyInterfaceDecoderFunc(t)}
c = codec{encode: encoder.encodeInterface, decode: constructMaybeEmptyInterfaceDecoderFunc(t)}

case reflect.Array:
c = constructArrayCodec(t, seen, canAddr)
Expand Down Expand Up @@ -711,9 +711,9 @@ func constructPointerDecodeFunc(t reflect.Type, decode decodeFunc) decodeFunc {
}
}

func constructNonEmptyInterfaceDecoderFunc(t reflect.Type) decodeFunc {
func constructMaybeEmptyInterfaceDecoderFunc(t reflect.Type) decodeFunc {
return func(d decoder, b []byte, p unsafe.Pointer) ([]byte, error) {
return d.decodeNonEmptyInterface(b, p, t)
return d.decodeMaybeEmptyInterface(b, p, t)
}
}

Expand Down
4 changes: 3 additions & 1 deletion json/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ func (d decoder) decodeInterface(b []byte, p unsafe.Pointer) ([]byte, error) {
return b, nil
}

func (d decoder) decodeNonEmptyInterface(b []byte, p unsafe.Pointer, t reflect.Type) ([]byte, error) {
func (d decoder) decodeMaybeEmptyInterface(b []byte, p unsafe.Pointer, t reflect.Type) ([]byte, error) {
if hasNullPrefix(b) {
*(*interface{})(p) = nil
return b[4:], nil
Expand All @@ -1097,6 +1097,8 @@ func (d decoder) decodeNonEmptyInterface(b []byte, p unsafe.Pointer, t reflect.T
if e := x.Elem(); e.Kind() == reflect.Ptr {
return Parse(b, e.Interface(), d.flags)
}
} else if t.NumMethod() == 0 { // empty interface
return Parse(b, (*interface{})(p), d.flags)
}

return d.decodeUnmarshalTypeError(b, p, t)
Expand Down
11 changes: 11 additions & 0 deletions json/json_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1464,3 +1464,14 @@ func TestGithubIssue23(t *testing.T) {
}
})
}

func TestGithubIssue26(t *testing.T) {
type interfaceType interface{}

var value interfaceType
var data = []byte(`{}`)

if err := Unmarshal(data, &value); err != nil {
t.Error(err)
}
}