go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2025-02-19 19:59:49 +02:00
Code Issues Releases Activity

fix #243 fuzzy decoder should take null as valid input

Browse Source
This commit is contained in:
Tao Wen 2018-02-26 23:22:22 +08:00
parent fff342fd04
commit ad83167dc6
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extra/fuzzy_decoder.go
View File

@ -183,6 +183,9 @@ func (decoder *fuzzyStringDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Ite
*((*string)(ptr)) = string(number) *((*string)(ptr)) = string(number)
case jsoniter.StringValue: case jsoniter.StringValue:
*((*string)(ptr)) = iter.ReadString() *((*string)(ptr)) = iter.ReadString()
case jsoniter.NilValue:
iter.Skip()
*((*string)(ptr)) = ""
default: default:
iter.ReportError("fuzzyStringDecoder", "not number or string") iter.ReportError("fuzzyStringDecoder", "not number or string")
} }
@ -208,6 +211,9 @@ func (decoder *fuzzyIntegerDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.It
} else { } else {
str = "0" str = "0"
} }
case jsoniter.NilValue:
iter.Skip()
str = "0"
default: default:
iter.ReportError("fuzzyIntegerDecoder", "not number or string") iter.ReportError("fuzzyIntegerDecoder", "not number or string")
} }
@ -244,6 +250,9 @@ func (decoder *fuzzyFloat32Decoder) Decode(ptr unsafe.Pointer, iter *jsoniter.It
} else { } else {
*((*float32)(ptr)) = 0 *((*float32)(ptr)) = 0
} }
case jsoniter.NilValue:
iter.Skip()
*((*float32)(ptr)) = 0
default: default:
iter.ReportError("fuzzyFloat32Decoder", "not number or string") iter.ReportError("fuzzyFloat32Decoder", "not number or string")
} }
@ -273,7 +282,10 @@ func (decoder *fuzzyFloat64Decoder) Decode(ptr unsafe.Pointer, iter *jsoniter.It
} else { } else {
*((*float64)(ptr)) = 0 *((*float64)(ptr)) = 0
} }
case jsoniter.NilValue:
iter.Skip()
*((*float64)(ptr)) = 0
default: default:
iter.ReportError("fuzzyFloat32Decoder", "not number or string") iter.ReportError("fuzzyFloat64Decoder", "not number or string")
} }
} }

32
extra/fuzzy_decoder_test.go
View File

@ -357,3 +357,35 @@ func Test_bad_case(t *testing.T) {
should := require.New(t) should := require.New(t)
should.Nil(err) should.Nil(err)
} }
func Test_null_to_string(t *testing.T) {
should := require.New(t)
body := []byte(`null`)
var message string
err := jsoniter.Unmarshal(body, &message)
should.NoError(err)
}
func Test_null_to_int(t *testing.T) {
should := require.New(t)
body := []byte(`null`)
var message int
err := jsoniter.Unmarshal(body, &message)
should.NoError(err)
}
func Test_null_to_float32(t *testing.T) {
should := require.New(t)
body := []byte(`null`)
var message float32
err := jsoniter.Unmarshal(body, &message)
should.NoError(err)
}
func Test_null_to_float64(t *testing.T) {
should := require.New(t)
body := []byte(`null`)
var message float64
err := jsoniter.Unmarshal(body, &message)
should.NoError(err)
}