fix json-iterator#311 handle nil any

zhenzou · Oct 24, 2018 · edece26 · edece26
1 parent 605cf42
commit edece26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
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))
+}