Skip to content

fix: return error on out-of-range numeric casts instead of wrapping #372

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

Open
AdamMagued wants to merge 1 commit into
base: master
Choose a base branch
from
+364 −0
Open

fix: return error on out-of-range numeric casts instead of wrapping #372

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 235 additions & 0 deletions number.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"encoding/json"
"errors"
"fmt"
"math"
"regexp"
"strconv"
"strings"
Expand Down Expand Up @@ -95,28 +96,76 @@ func toNumber[T Number](i any) (T, bool) {
case T:
return s, true
case int:
if !numberFitsFromInt64[T](int64(s)) {
return 0, false
}

return T(s), true
case int8:
if !numberFitsFromInt64[T](int64(s)) {
return 0, false
}

return T(s), true
case int16:
if !numberFitsFromInt64[T](int64(s)) {
return 0, false
}

return T(s), true
case int32:
if !numberFitsFromInt64[T](int64(s)) {
return 0, false
}

return T(s), true
case int64:
if !numberFitsFromInt64[T](s) {
return 0, false
}

return T(s), true
case uint:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, false
}

return T(s), true
case uint8:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, false
}

return T(s), true
case uint16:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, false
}

return T(s), true
case uint32:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, false
}

return T(s), true
case uint64:
if !numberFitsFromUint64[T](s) {
return 0, false
}

return T(s), true
case float32:
if !numberFitsFromFloat64[T](float64(s)) {
return 0, false
}

return T(s), true
case float64:
if !numberFitsFromFloat64[T](s) {
return 0, false
}

return T(s), true
case bool:
if s {
Expand All @@ -127,8 +176,16 @@ func toNumber[T Number](i any) (T, bool) {
case nil:
return 0, true
case time.Weekday:
if !numberFitsFromInt64[T](int64(s)) {
return 0, false
}

return T(s), true
case time.Month:
if !numberFitsFromInt64[T](int64(s)) {
return 0, false
}

return T(s), true
}

Expand Down Expand Up @@ -203,52 +260,100 @@ func toUnsignedNumber[T Number](i any) (T, bool, bool) {
return 0, false, false
}

if !numberFitsFromInt64[T](int64(s)) {
return 0, true, false
}

return T(s), true, true
case int8:
if s < 0 {
return 0, false, false
}

if !numberFitsFromInt64[T](int64(s)) {
return 0, true, false
}

return T(s), true, true
case int16:
if s < 0 {
return 0, false, false
}

if !numberFitsFromInt64[T](int64(s)) {
return 0, true, false
}

return T(s), true, true
case int32:
if s < 0 {
return 0, false, false
}

if !numberFitsFromInt64[T](int64(s)) {
return 0, true, false
}

return T(s), true, true
case int64:
if s < 0 {
return 0, false, false
}

if !numberFitsFromInt64[T](s) {
return 0, true, false
}

return T(s), true, true
case uint:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, true, false
}

return T(s), true, true
case uint8:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, true, false
}

return T(s), true, true
case uint16:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, true, false
}

return T(s), true, true
case uint32:
if !numberFitsFromUint64[T](uint64(s)) {
return 0, true, false
}

return T(s), true, true
case uint64:
if !numberFitsFromUint64[T](s) {
return 0, true, false
}

return T(s), true, true
case float32:
if s < 0 {
return 0, false, false
}

if !numberFitsFromFloat64[T](float64(s)) {
return 0, true, false
}

return T(s), true, true
case float64:
if s < 0 {
return 0, false, false
}

if !numberFitsFromFloat64[T](s) {
return 0, true, false
}

return T(s), true, true
case bool:
if s {
Expand All @@ -263,18 +368,148 @@ func toUnsignedNumber[T Number](i any) (T, bool, bool) {
return 0, false, false
}

if !numberFitsFromInt64[T](int64(s)) {
return 0, true, false
}

return T(s), true, true
case time.Month:
if s < 0 {
return 0, false, false
}

if !numberFitsFromInt64[T](int64(s)) {
return 0, true, false
}

return T(s), true, true
}

return 0, true, false
}

const (
maxInt64AsFloat = float64(1 << 63)
minInt64AsFloat = float64(-1 << 63)
maxUint64AsFloat = float64(1 << 64)
)

func numberFitsFromInt64[T Number](v int64) bool {
var t T

switch any(t).(type) {
case int8:
return v >= math.MinInt8 && v <= math.MaxInt8
case int16:
return v >= math.MinInt16 && v <= math.MaxInt16
case int32:
return v >= math.MinInt32 && v <= math.MaxInt32
case int64:
return true
case int:
if strconv.IntSize == 32 {
return v >= math.MinInt32 && v <= math.MaxInt32
}

return true
case uint8:
return v >= 0 && v <= math.MaxUint8
case uint16:
return v >= 0 && v <= math.MaxUint16
case uint32:
return v >= 0 && v <= math.MaxUint32
case uint64:
return v >= 0
case uint:
return v >= 0 && (strconv.IntSize == 64 || v <= math.MaxUint32)
case float32, float64:
return true
}

return false
}

func numberFitsFromUint64[T Number](v uint64) bool {
var t T

switch any(t).(type) {
case int8:
return v <= math.MaxInt8
case int16:
return v <= math.MaxInt16
case int32:
return v <= math.MaxInt32
case int64:
return v <= math.MaxInt64
case int:
if strconv.IntSize == 32 {
return v <= math.MaxInt32
}

return v <= math.MaxInt64
case uint8:
return v <= math.MaxUint8
case uint16:
return v <= math.MaxUint16
case uint32:
return v <= math.MaxUint32
case uint64:
return true
case uint:
return strconv.IntSize == 64 || v <= math.MaxUint32
case float32, float64:
return true
}

return false
}

func numberFitsFromFloat64[T Number](v float64) bool {
var t T

switch any(t).(type) {
case float32, float64:
return true
}

if math.IsNaN(v) || math.IsInf(v, 0) {
return false
}

switch any(t).(type) {
case int8:
return v > math.MinInt8-1 && v < math.MaxInt8+1
case int16:
return v > math.MinInt16-1 && v < math.MaxInt16+1
case int32:
return v > math.MinInt32-1 && v < math.MaxInt32+1
case int64:
return v >= minInt64AsFloat && v < maxInt64AsFloat
case int:
if strconv.IntSize == 32 {
return v > math.MinInt32-1 && v < math.MaxInt32+1
}

return v >= minInt64AsFloat && v < maxInt64AsFloat
case uint8:
return v >= 0 && v < math.MaxUint8+1
case uint16:
return v >= 0 && v < math.MaxUint16+1
case uint32:
return v >= 0 && v < math.MaxUint32+1
case uint64:
return v >= 0 && v < maxUint64AsFloat
case uint:
if strconv.IntSize == 32 {
return v >= 0 && v < math.MaxUint32+1
}

return v >= 0 && v < maxUint64AsFloat
}

return false
}

func toUnsignedNumberE[T Number](i any, parseFn func(string) (T, error)) (T, error) {
n, valid, ok := toUnsignedNumber[T](i)
if ok {
Expand Down
Loading