fix json-iterator#311 handle nil any

taowen · taowen · commit 5916df66b373 · 2018-10-24T21:05:37.000+08:00
diff --git a/any.go b/any.go
@@ -312,6 +312,10 @@ func (codec *directAnyCodec) Decode(ptr unsafe.Pointer, iter *Iterator) {
 
 func (codec *directAnyCodec) Encode(ptr unsafe.Pointer, stream *Stream) {
 	any := *(*Any)(ptr)
+	if any == nil {
+		stream.WriteNil()
+		return
+	}
 	any.WriteTo(stream)
 }
 
diff --git a/value_tests/invalid_test.go b/value_tests/invalid_test.go
@@ -224,3 +224,13 @@ func Test_EmptyInput(t *testing.T) {
 		t.Errorf("Expected error")
 	}
 }
+
+type Foo struct {
+	A jsoniter.Any
+}
+
+func Test_nil_any(t *testing.T) {
+	should := require.New(t)
+	data, _ := jsoniter.Marshal(&Foo{})
+	should.Equal(`{"A":null}`, string(data))
+}

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,10 @@ func (codec directAnyCodec) Decode(ptr unsafe.Pointer, iter Iterator) {`
`312`	`312`
`313`	`313`	`func (codec directAnyCodec) Encode(ptr unsafe.Pointer, stream Stream) {`
`314`	`314`	`any := (Any)(ptr)`
	`315`	`+ if any == nil {`
	`316`	`+ stream.WriteNil()`
	`317`	`+ return`
	`318`	`+ }`
`315`	`319`	`any.WriteTo(stream)`
`316`	`320`	`}`
`317`	`321`
Original file line number	Diff line number	Diff line change
`@@ -224,3 +224,13 @@ func Test_EmptyInput(t *testing.T) {`
`224`	`224`	`t.Errorf("Expected error")`
`225`	`225`	`}`
`226`	`226`	`}`
	`227`	`+`
	`228`	`+type Foo struct {`
	`229`	`+ A jsoniter.Any`
	`230`	`+}`
	`231`	`+`
	`232`	`+func Test_nil_any(t *testing.T) {`
	`233`	`+ should := require.New(t)`
	`234`	`+ data, _ := jsoniter.Marshal(&Foo{})`
	`235`	+ should.Equal(`{"A":null}`, string(data))
	`236`	`+}`