Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions integer.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ func parseNumber(s *scanner) (interface{}, error) {
)

for s.off < len(s.data) {
size := s.off - start
if (t == typeInteger && (size >= 15)) || size >= 16 {
return 0, &UnmarshalError{s.off, ErrNumberOutOfRange}
}

c := s.data[s.off]
if isDigit(c) {
s.off++

// The length limit applies to the consumed digits, not to the delimiter that follows them.
if size := s.off - start; (t == typeInteger && size > 15) || size > 16 {
return 0, &UnmarshalError{s.off, ErrNumberOutOfRange}
}

continue
}

if t == typeInteger && c == '.' {
if size > maxDigit {
if s.off-start > maxDigit {
return 0, &UnmarshalError{s.off, ErrNumberOutOfRange}
}

Expand Down
2 changes: 2 additions & 0 deletions integer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ func TestParseIntegerOrDecimal(t *testing.T) {
{"10.", 0, true},
{"10.1234", 0, true},
{"-", 0, true},
{"123456789012345, 1", int64(123456789012345), false},
{"123456789012.123, 1.1", 123456789012.123, false},
{"1234567890123456", 0, true},
{"123456789012345.6", 0, true},
{"1234567890123.", 0, true},
Expand Down