go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-04-01 21:24:21 +02:00
Code Issues Releases Activity

Merge pull request #169 from toffaletti/fix-nil-interface

Browse Source 
Fix handling of nil empty interface
This commit is contained in:
Tao Wen 2017-09-15 00:45:11 -05:00 committed by GitHub
commit eef35e549b
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
feature_reflect_native.go
View File

@ -373,7 +373,8 @@ func (codec *emptyInterfaceCodec) EncodeInterface(val interface{}, stream *Strea
} }
func (codec *emptyInterfaceCodec) IsEmpty(ptr unsafe.Pointer) bool { func (codec *emptyInterfaceCodec) IsEmpty(ptr unsafe.Pointer) bool {
return ptr == nil emptyInterface := (*emptyInterface)(ptr)
return emptyInterface.typ == nil
} }
type nonEmptyInterfaceCodec struct { type nonEmptyInterfaceCodec struct {

19
jsoniter_interface_test.go
View File

@ -351,3 +351,22 @@ func Test_nil_out_null_interface(t *testing.T) {
should.Equal(nil, err) should.Equal(nil, err)
should.Equal(nil, obj2.Field) 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)
}