Skip to content

fix: parse int and uint using the native integer width #438

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
jakezwang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: parse int and uint using the native integer width #438

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
4 changes: 2 additions & 2 deletions env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var defaultBuiltInParsers = map[reflect.Kind]ParserFunc{ //nolint:gochecknogloba
return v, nil
},
reflect.Int: func(v string) (interface{}, error) {
i, err := strconv.ParseInt(v, 10, 32)
i, err := strconv.ParseInt(v, 10, strconv.IntSize)
return int(i), err
},
reflect.Int16: func(v string) (interface{}, error) {
Expand All @@ -54,7 +54,7 @@ var defaultBuiltInParsers = map[reflect.Kind]ParserFunc{ //nolint:gochecknogloba
return int8(i), err
},
reflect.Uint: func(v string) (interface{}, error) {
i, err := strconv.ParseUint(v, 10, 32)
i, err := strconv.ParseUint(v, 10, strconv.IntSize)
return uint(i), err
},
reflect.Uint16: func(v string) (interface{}, error) {
Expand Down
39 changes: 39 additions & 0 deletions env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,45 @@ import (
"time"
)

func TestNativeIntegerRange(t *testing.T) {
minInt, maxInt, maxUint := "-2147483648", "2147483647", "4294967295"
intOverflow, uintOverflow := "2147483648", "4294967296"
if strconv.IntSize == 64 {
minInt, maxInt, maxUint = "-9223372036854775808", "9223372036854775807", "18446744073709551615"
intOverflow, uintOverflow = "9223372036854775808", "18446744073709551616"
}

t.Run("valid", func(t *testing.T) {
var cfg struct {
MinInt int `env:"MIN_INT"`
MaxInt int `env:"MAX_INT"`
MaxUint uint `env:"MAX_UINT"`
}
isNoErr(t, ParseWithOptions(&cfg, Options{Environment: map[string]string{
"MIN_INT": minInt, "MAX_INT": maxInt, "MAX_UINT": maxUint,
}}))
isEqual(t, minInt, strconv.FormatInt(int64(cfg.MinInt), 10))
isEqual(t, maxInt, strconv.FormatInt(int64(cfg.MaxInt), 10))
isEqual(t, maxUint, strconv.FormatUint(uint64(cfg.MaxUint), 10))
})

t.Run("int_overflow", func(t *testing.T) {
var cfg struct {
Value int `env:"VALUE"`
}
err := ParseWithOptions(&cfg, Options{Environment: map[string]string{"VALUE": intOverflow}})
isErrorWithMessage(t, err, `env: parse error on field "Value" of type "int": strconv.ParseInt: parsing `+strconv.Quote(intOverflow)+`: value out of range`)
})

t.Run("uint_overflow", func(t *testing.T) {
var cfg struct {
Value uint `env:"VALUE"`
}
err := ParseWithOptions(&cfg, Options{Environment: map[string]string{"VALUE": uintOverflow}})
isErrorWithMessage(t, err, `env: parse error on field "Value" of type "uint": strconv.ParseUint: parsing `+strconv.Quote(uintOverflow)+`: value out of range`)
})
}

type unmarshaler struct {
time.Duration
}
Expand Down