Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make it return 0 when fuzzy decoding empty string to float32/float64 #636

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make it return 0 when fuzzy decoding empty string to float32/float64 #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions extra/fuzzy_decoder.go
View file
Open in desktop
Expand Up @@ -240,6 +240,9 @@ func (decoder *fuzzyFloat32Decoder) Decode(ptr unsafe.Pointer, iter *jsoniter.It
*((*float32)(ptr)) = iter.ReadFloat32()
case jsoniter.StringValue:
str = iter.ReadString()
if len(str) == 0 {
str = "0"
}
newIter := iter.Pool().BorrowIterator([]byte(str))
defer iter.Pool().ReturnIterator(newIter)
*((*float32)(ptr)) = newIter.ReadFloat32()
Expand Down Expand Up @@ -272,6 +275,9 @@ func (decoder *fuzzyFloat64Decoder) Decode(ptr unsafe.Pointer, iter *jsoniter.It
*((*float64)(ptr)) = iter.ReadFloat64()
case jsoniter.StringValue:
str = iter.ReadString()
if len(str) == 0 {
str = "0"
}
newIter := iter.Pool().BorrowIterator([]byte(str))
defer iter.Pool().ReturnIterator(newIter)
*((*float64)(ptr)) = newIter.ReadFloat64()
Expand Down
22 changes: 22 additions & 0 deletions extra/fuzzy_decoder_test.go
View file
Open in desktop
Expand Up @@ -65,6 +65,8 @@ func Test_any_to_int(t *testing.T) {
should.Equal(10, val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(10, val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(0, val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -89,6 +91,8 @@ func Test_any_to_int16(t *testing.T) {
should.Equal(int16(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(int16(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(int16(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -113,6 +117,8 @@ func Test_any_to_int32(t *testing.T) {
should.Equal(int32(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(int32(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(int32(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -137,6 +143,8 @@ func Test_any_to_int8(t *testing.T) {
should.Equal(int8(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(int8(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(int8(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -161,6 +169,8 @@ func Test_any_to_uint8(t *testing.T) {
should.Equal(uint8(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(uint8(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(uint8(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -186,6 +196,8 @@ func Test_any_to_uint64(t *testing.T) {
should.Equal(uint64(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(uint64(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(uint64(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand Down Expand Up @@ -213,6 +225,8 @@ func Test_any_to_uint32(t *testing.T) {
should.Equal(uint32(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(uint32(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(uint32(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand Down Expand Up @@ -240,6 +254,8 @@ func Test_any_to_uint16(t *testing.T) {
should.Equal(uint16(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(uint16(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(uint16(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -266,6 +282,8 @@ func Test_any_to_uint(t *testing.T) {
should.Equal(uint(10), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(uint(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(uint(0), val)

should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
should.Equal(uint(0), val)
Expand All @@ -290,6 +308,8 @@ func Test_any_to_float32(t *testing.T) {
should.Equal(float32(10.1), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(float32(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(float32(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand All @@ -314,6 +334,8 @@ func Test_any_to_float64(t *testing.T) {
should.Equal(float64(10.1), val)
should.Nil(jsoniter.UnmarshalFromString(`10`, &val))
should.Equal(float64(10), val)
should.Nil(jsoniter.UnmarshalFromString(`""`, &val))
should.Equal(float64(0), val)

// bool part
should.Nil(jsoniter.UnmarshalFromString(`false`, &val))
Expand Down