go/json-iterator
1
0
Fork 0
mirror of https://github.com/json-iterator/go.git synced 2024-11-27 08:30:57 +02:00
Code Issues Releases Activity

fix int min max

Browse Source
This commit is contained in:
Tao Wen 2017-01-16 09:01:44 +08:00
parent 54a69f1da2
commit b9e3f01bfd
2 changed files with 118 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
feature_iter_int.go
View File

@ -1,15 +1,17 @@
package jsoniter package jsoniter
import "strconv"
var intDigits []int8 var intDigits []int8
const int8SafeToMultiply10 = uint32(int8(0x7f) / 10 - 10) const uint32SafeToMultiply10 = uint32(0xffffffff) / 10 - 1
const uint8SafeToMultiply10 = uint32(0xff) / 10 - 10 const uint64SafeToMultiple10 = uint64(0xffffffffffffffff) / 10 - 1
const int16SafeToMultiply10 = uint32(int16(0x7fff) / 10 - 10) const int64Max = uint64(0x7fffffffffffffff)
const uint16SafeToMultiply10 = uint32(0xffff) / 10 - 10 const int32Max = uint32(0x7fffffff)
const int32SafeToMultiply10 = uint32(int32(0x7fffffff) / 10 - 10) const int16Max = uint32(0x7fff)
const uint32SafeToMultiply10 = uint32(0xffffffff) / 10 - 10 const uint16Max = uint32(0xffff)
const uint64SafeToMultiple10 = uint64(0xffffffffffffffff) / 10 - 10 const int8Max = uint32(0x7fff)
const int64SafeToMultiple10 = uint64(int64(0x7fffffffffffffff) / 10 - 10) const uint8Max = uint32(0xffff)
func init() { func init() {
intDigits = make([]int8, 256) intDigits = make([]int8, 256)
@ -29,46 +31,86 @@ func (iter *Iterator) ReadInt() int {
return int(iter.ReadInt64()) return int(iter.ReadInt64())
} }
func (iter *Iterator) ReadInt8() int8 { func (iter *Iterator) ReadInt8() (ret int8) {
c := iter.nextToken() c := iter.nextToken()
if c == '-' { if c == '-' {
return -int8(iter.readUint32(int8SafeToMultiply10, iter.readByte())) val := iter.readUint32(iter.readByte())
if val > int8Max + 1 {
iter.reportError("ReadInt8", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return -int8(val)
} else { } else {
return int8(iter.readUint32(int8SafeToMultiply10, c)) val := iter.readUint32(c)
if val > int8Max {
iter.reportError("ReadInt8", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return int8(val)
} }
} }
func (iter *Iterator) ReadUint8() (ret uint8) { func (iter *Iterator) ReadUint8() (ret uint8) {
return uint8(iter.readUint32(uint8SafeToMultiply10, iter.nextToken())) val := iter.readUint32(iter.nextToken())
if val > uint8Max {
iter.reportError("ReadUint8", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return uint8(val)
} }
func (iter *Iterator) ReadInt16() int16 { func (iter *Iterator) ReadInt16() (ret int16) {
c := iter.nextToken() c := iter.nextToken()
if c == '-' { if c == '-' {
return -int16(iter.readUint32(int16SafeToMultiply10, iter.readByte())) val := iter.readUint32(iter.readByte())
if val > int16Max + 1 {
iter.reportError("ReadInt16", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return -int16(val)
} else { } else {
return int16(iter.readUint32(int16SafeToMultiply10, c)) val := iter.readUint32(c)
if val > int16Max {
iter.reportError("ReadInt16", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return int16(val)
} }
} }
func (iter *Iterator) ReadUint16() uint16 { func (iter *Iterator) ReadUint16() (ret uint16) {
return uint16(iter.readUint32(uint16SafeToMultiply10, iter.nextToken())) val := iter.readUint32(iter.nextToken())
if val > uint16Max {
iter.reportError("ReadUint16", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return uint16(val)
} }
func (iter *Iterator) ReadInt32() int32 { func (iter *Iterator) ReadInt32() (ret int32) {
c := iter.nextToken() c := iter.nextToken()
if c == '-' { if c == '-' {
return -int32(iter.readUint32(int32SafeToMultiply10, iter.readByte())) val := iter.readUint32(iter.readByte())
if val > int32Max + 1 {
iter.reportError("ReadInt32", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return -int32(val)
} else { } else {
return int32(iter.readUint32(int32SafeToMultiply10, c)) val := iter.readUint32(c)
if val > int32Max {
iter.reportError("ReadInt32", "overflow: " + strconv.FormatInt(int64(val), 10))
return
}
return int32(val)
} }
} }
func (iter *Iterator) ReadUint32() uint32 { func (iter *Iterator) ReadUint32() (ret uint32) {
return iter.readUint32(uint32SafeToMultiply10, iter.nextToken()) return iter.readUint32(iter.nextToken())
} }
func (iter *Iterator) readUint32(safeToMultiply10 uint32, c byte) (ret uint32) { func (iter *Iterator) readUint32(c byte) (ret uint32) {
ind := intDigits[c] ind := intDigits[c]
if ind == 0 { if ind == 0 {
return 0 // single zero return 0 // single zero
@ -84,9 +126,9 @@ func (iter *Iterator) readUint32(safeToMultiply10 uint32, c byte) (ret uint32) {
if ind == invalidCharForNumber { if ind == invalidCharForNumber {
return value return value
} }
if value > safeToMultiply10 { if value > uint32SafeToMultiply10 {
value2 := (value << 3) + (value << 1) + uint32(ind) value2 := (value << 3) + (value << 1) + uint32(ind)
if value2 < safeToMultiply10 * 10 { if value2 < value {
iter.reportError("readUint32", "overflow") iter.reportError("readUint32", "overflow")
return return
} else { } else {
@ -102,20 +144,30 @@ func (iter *Iterator) readUint32(safeToMultiply10 uint32, c byte) (ret uint32) {
} }
} }
func (iter *Iterator) ReadInt64() int64 { func (iter *Iterator) ReadInt64() (ret int64) {
c := iter.nextToken() c := iter.nextToken()
if c == '-' { if c == '-' {
return -int64(iter.readUint64(int64SafeToMultiple10, iter.readByte())) val := iter.readUint64(iter.readByte())
if val > int64Max + 1 {
iter.reportError("ReadInt64", "overflow: " + strconv.FormatUint(uint64(val), 10))
return
}
return -int64(val)
} else { } else {
return int64(iter.readUint64(int64SafeToMultiple10, c)) val := iter.readUint64(c)
if val > int64Max {
iter.reportError("ReadInt64", "overflow: " + strconv.FormatUint(uint64(val), 10))
return
}
return int64(val)
} }
} }
func (iter *Iterator) ReadUint64() uint64 { func (iter *Iterator) ReadUint64() uint64 {
return iter.readUint64(uint64SafeToMultiple10, iter.nextToken()) return iter.readUint64(iter.nextToken())
} }
func (iter *Iterator) readUint64(safeToMultiply10 uint64, c byte) (ret uint64) { func (iter *Iterator) readUint64(c byte) (ret uint64) {
ind := intDigits[c] ind := intDigits[c]
if ind == 0 { if ind == 0 {
return 0 // single zero return 0 // single zero
@ -131,9 +183,9 @@ func (iter *Iterator) readUint64(safeToMultiply10 uint64, c byte) (ret uint64) {
if ind == invalidCharForNumber { if ind == invalidCharForNumber {
return value return value
} }
if value > safeToMultiply10 { if value > uint64SafeToMultiple10 {
value2 := (value << 3) + (value << 1) + uint64(ind) value2 := (value << 3) + (value << 1) + uint64(ind)
if value2 < safeToMultiply10 * 10 { if value2 < value {
iter.reportError("readUint64", "overflow") iter.reportError("readUint64", "overflow")
return return
} else { } else {

43
jsoniter_int_test.go
View File

@ -10,7 +10,6 @@ import (
"io/ioutil" "io/ioutil"
) )
func Test_read_uint64_invalid(t *testing.T) { func Test_read_uint64_invalid(t *testing.T) {
should := require.New(t) should := require.New(t)
iter := ParseString(",") iter := ParseString(",")
@ -18,8 +17,34 @@ func Test_read_uint64_invalid(t *testing.T) {
should.NotNil(iter.Error) should.NotNil(iter.Error)
} }
func Test_read_int8(t *testing.T) {
inputs := []string{`127`, `-128`}
for _, input := range inputs {
t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
should := require.New(t)
iter := ParseString(input)
expected, err := strconv.ParseInt(input, 10, 8)
should.Nil(err)
should.Equal(int8(expected), iter.ReadInt8())
})
}
}
func Test_read_int16(t *testing.T) {
inputs := []string{`32767`, `-32768`}
for _, input := range inputs {
t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
should := require.New(t)
iter := ParseString(input)
expected, err := strconv.ParseInt(input, 10, 16)
should.Nil(err)
should.Equal(int16(expected), iter.ReadInt16())
})
}
}
func Test_read_int32(t *testing.T) { func Test_read_int32(t *testing.T) {
inputs := []string{`1`, `12`, `123`, `1234`, `12345`, `123456`, `2147483647`} inputs := []string{`1`, `12`, `123`, `1234`, `12345`, `123456`, `2147483647`, `-2147483648`}
for _, input := range inputs { for _, input := range inputs {
t.Run(fmt.Sprintf("%v", input), func(t *testing.T) { t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
should := require.New(t) should := require.New(t)
@ -40,14 +65,14 @@ func Test_read_int32(t *testing.T) {
func Test_read_int32_overflow(t *testing.T) { func Test_read_int32_overflow(t *testing.T) {
should := require.New(t) should := require.New(t)
input := "123456789123456789" input := "123456789123456789,"
iter := ParseString(input) iter := ParseString(input)
iter.ReadInt32() iter.ReadInt32()
should.NotNil(iter.Error) should.NotNil(iter.Error)
} }
func Test_read_int64(t *testing.T) { func Test_read_int64(t *testing.T) {
inputs := []string{`1`, `12`, `123`, `1234`, `12345`, `123456`, `9223372036854775807`} inputs := []string{`1`, `12`, `123`, `1234`, `12345`, `123456`, `9223372036854775807`, `-9223372036854775808`}
for _, input := range inputs { for _, input := range inputs {
t.Run(fmt.Sprintf("%v", input), func(t *testing.T) { t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
should := require.New(t) should := require.New(t)
@ -68,7 +93,7 @@ func Test_read_int64(t *testing.T) {
func Test_read_int64_overflow(t *testing.T) { func Test_read_int64_overflow(t *testing.T) {
should := require.New(t) should := require.New(t)
input := "123456789123456789" input := "123456789123456789123456789123456789,"
iter := ParseString(input) iter := ParseString(input)
iter.ReadInt64() iter.ReadInt64()
should.NotNil(iter.Error) should.NotNil(iter.Error)
@ -268,8 +293,8 @@ func Test_write_int32(t *testing.T) {
func Test_write_uint64(t *testing.T) { func Test_write_uint64(t *testing.T) {
vals := []uint64{0, 1, 11, 111, 255, 999999, 0xfff, 0xffff, 0xfffff, 0xffffff, 0xfffffff, 0xffffffff, vals := []uint64{0, 1, 11, 111, 255, 999999, 0xfff, 0xffff, 0xfffff, 0xffffff, 0xfffffff, 0xffffffff,
0xfffffffff,0xffffffffff,0xfffffffffff,0xffffffffffff,0xfffffffffffff,0xffffffffffffff, 0xfffffffff, 0xffffffffff, 0xfffffffffff, 0xffffffffffff, 0xfffffffffffff, 0xffffffffffffff,
0xfffffffffffffff,0xffffffffffffffff} 0xfffffffffffffff, 0xffffffffffffffff}
for _, val := range vals { for _, val := range vals {
t.Run(fmt.Sprintf("%v", val), func(t *testing.T) { t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
should := require.New(t) should := require.New(t)
@ -302,8 +327,8 @@ func Test_write_uint64(t *testing.T) {
func Test_write_int64(t *testing.T) { func Test_write_int64(t *testing.T) {
vals := []int64{0, 1, 11, 111, 255, 999999, 0xfff, 0xffff, 0xfffff, 0xffffff, 0xfffffff, 0xffffffff, vals := []int64{0, 1, 11, 111, 255, 999999, 0xfff, 0xffff, 0xfffff, 0xffffff, 0xfffffff, 0xffffffff,
0xfffffffff,0xffffffffff,0xfffffffffff,0xffffffffffff,0xfffffffffffff,0xffffffffffffff, 0xfffffffff, 0xffffffffff, 0xfffffffffff, 0xffffffffffff, 0xfffffffffffff, 0xffffffffffffff,
0xfffffffffffffff,0x7fffffffffffffff,-0x7fffffffffffffff} 0xfffffffffffffff, 0x7fffffffffffffff, -0x7fffffffffffffff}
for _, val := range vals { for _, val := range vals {
t.Run(fmt.Sprintf("%v", val), func(t *testing.T) { t.Run(fmt.Sprintf("%v", val), func(t *testing.T) {
should := require.New(t) should := require.New(t)