From e0df39fda2b9f1cbf59abbfac7f1afe444d06564 Mon Sep 17 00:00:00 2001 From: Tao Wen Date: Thu, 14 Dec 2017 17:18:05 +0800 Subject: [PATCH] fix #206, do not allow nil pointer as unmarshal input --- feature_reflect.go | 4 ++++ jsoniter_invalid_test.go | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/feature_reflect.go b/feature_reflect.go index bed7764..f0b7c37 100644 --- a/feature_reflect.go +++ b/feature_reflect.go @@ -233,6 +233,10 @@ func (iter *Iterator) ReadVal(obj interface{}) { return } e := (*emptyInterface)(unsafe.Pointer(&obj)) + if e.word == nil { + iter.ReportError("ReadVal", "can not read into nil pointer") + return + } decoder.Decode(e.word, iter) } diff --git a/jsoniter_invalid_test.go b/jsoniter_invalid_test.go index 69be4dc..0eb4f1d 100644 --- a/jsoniter_invalid_test.go +++ b/jsoniter_invalid_test.go @@ -136,3 +136,14 @@ func Test_valid(t *testing.T) { should.True(Valid([]byte(`{}`))) should.False(Valid([]byte(`{`))) } + +func Test_nil_pointer(t *testing.T) { + should := require.New(t) + data := []byte(`{"A":0}`) + type T struct { + X int + } + var obj *T + err := Unmarshal(data, obj) + should.NotNil(err) +}