Skip to content

Fix handling of nil empty interface #169

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.

Sign up for GitHub

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
taowen merged 2 commits into from
Sep 15, 2017
Merged

Fix handling of nil empty interface #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e658f65
add failing test for handling of nil interface with omitempty
toffaletti Sep 15, 2017
005d86d
fix handling of nil empty interface
toffaletti Sep 15, 2017
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
3 changes: 2 additions & 1 deletion feature_reflect_native.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,8 @@ func (codec *emptyInterfaceCodec) EncodeInterface(val interface{}, stream *Strea
}

func (codec *emptyInterfaceCodec) IsEmpty(ptr unsafe.Pointer) bool {
return ptr == nil
emptyInterface := (*emptyInterface)(ptr)
return emptyInterface.typ == nil
}

type nonEmptyInterfaceCodec struct {
Expand Down
19 changes: 19 additions & 0 deletions jsoniter_interface_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,3 +351,22 @@ func Test_nil_out_null_interface(t *testing.T) {
should.Equal(nil, err)
should.Equal(nil, obj2.Field)
}

func Test_omitempty_nil_interface(t *testing.T) {
type TestData struct {
Field interface{} `json:"field,omitempty"`
}
should := require.New(t)

obj := TestData{
Field: nil,
}

js, err := json.Marshal(obj)
should.Equal(nil, err)
should.Equal("{}", string(js))

str, err := MarshalToString(obj)
should.Equal(nil, err)
should.Equal(string(js), str)
}