diff options
| author | 2021-12-12 15:47:51 +0100 | |
|---|---|---|
| committer | 2021-12-12 15:47:51 +0100 | |
| commit | 67ac8db190eb82a7758746fb021fa3014f4241b7 (patch) | |
| tree | 4a4124ad8f0ee9ec8858b109dd0bcc2e567fc144 /vendor/github.com/mitchellh/mapstructure | |
| parent | upstep dependencies (#339) (diff) | |
| download | gotosocial-67ac8db190eb82a7758746fb021fa3014f4241b7.tar.xz | |
Upstep Go dependencies (#340)
* Upstep Go dependencies
* tiny linter fix
* Tidy
Diffstat (limited to 'vendor/github.com/mitchellh/mapstructure')
| -rw-r--r-- | vendor/github.com/mitchellh/mapstructure/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | vendor/github.com/mitchellh/mapstructure/mapstructure.go | 8 | 
2 files changed, 6 insertions, 6 deletions
diff --git a/vendor/github.com/mitchellh/mapstructure/CHANGELOG.md b/vendor/github.com/mitchellh/mapstructure/CHANGELOG.md index 9fe803a5e..38a099162 100644 --- a/vendor/github.com/mitchellh/mapstructure/CHANGELOG.md +++ b/vendor/github.com/mitchellh/mapstructure/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.4.3 + +* Fix cases where `json.Number` didn't decode properly [GH-261] +  ## 1.4.2  * Custom name matchers to support any sort of casing, formatting, etc. for diff --git a/vendor/github.com/mitchellh/mapstructure/mapstructure.go b/vendor/github.com/mitchellh/mapstructure/mapstructure.go index dcee0f2d6..6b81b0067 100644 --- a/vendor/github.com/mitchellh/mapstructure/mapstructure.go +++ b/vendor/github.com/mitchellh/mapstructure/mapstructure.go @@ -684,16 +684,12 @@ func (d *Decoder) decodeUint(name string, data interface{}, val reflect.Value) e  		}  	case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":  		jn := data.(json.Number) -		i, err := jn.Int64() +		i, err := strconv.ParseUint(string(jn), 0, 64)  		if err != nil {  			return fmt.Errorf(  				"error decoding json.Number into %s: %s", name, err)  		} -		if i < 0 && !d.config.WeaklyTypedInput { -			return fmt.Errorf("cannot parse '%s', %d overflows uint", -				name, i) -		} -		val.SetUint(uint64(i)) +		val.SetUint(i)  	default:  		return fmt.Errorf(  			"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",  | 
