qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 19:05:01 -07:00
Code Releases Activity

time: accept numbers larger than 2^32 in ParseDuration.

Browse Source 
Fixes #3374.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6683047
This commit is contained in:
David Symonds 2012-10-15 07:50:13 +11:00
parent 240834374a
commit f2045aadd9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pkg/time/format.go
View File

@ -323,7 +323,8 @@ func atoi(s string) (x int, err error) {
neg = true
s = s[1:]
}
x, rem, err := leadingInt(s)
q, rem, err := leadingInt(s)
x = int(q)
if err != nil || rem != "" {
return 0, atoiError
}
@ -954,18 +955,18 @@ func parseNanoseconds(value string, nbytes int) (ns int, rangeErrString string,
var errLeadingInt = errors.New("time: bad [0-9]*") // never printed
// leadingInt consumes the leading [0-9]* from s.
func leadingInt(s string) (x int, rem string, err error) {
func leadingInt(s string) (x int64, rem string, err error) {
i := 0
for ; i < len(s); i++ {
c := s[i]
if c < '0' || c > '9' {
break
}
if x >= (1<<31-10)/10 {
if x >= (1<<63-10)/10 {
// overflow
return 0, "", errLeadingInt
}
x = x*10 + int(c) - '0'
x = x*10 + int64(c) - '0'
}
return x, s[i:], nil
}
@ -1010,7 +1011,7 @@ func ParseDuration(s string) (Duration, error) {
for s != "" {
g := float64(0) // this element of the sequence
var x int
var x int64
var err error
// The next character must be [0-9.]

2
src/pkg/time/time_test.go
View File

@ -999,6 +999,8 @@ var parseDurationTests = []struct {
{"-2m3.4s", true, -(2*Minute + 3*Second + 400*Millisecond)},
{"1h2m3s4ms5us6ns", true, 1*Hour + 2*Minute + 3*Second + 4*Millisecond + 5*Microsecond + 6*Nanosecond},
{"39h9m14.425s", true, 39*Hour + 9*Minute + 14*Second + 425*Millisecond},
// large value
{"52763797000ns", true, 52763797000 * Nanosecond},
// errors
{"", false, 0},