qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-25 13:20:13 -06:00
Code Releases Activity

time: fix ParseDuration overflow when given more than 9 digits on 32-bit arch

Browse Source 
Fixes #6617.

R=golang-dev, rsc, r
CC=golang-dev
https://golang.org/cl/15080043
This commit is contained in:
Shenghou Ma 2013-10-22 18:33:05 -04:00 committed by Russ Cox
parent 580ea8b5fd
commit d220c9957c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1204,11 +1204,11 @@ func ParseDuration(s string) (Duration, error) {
if err != nil { if err != nil {
return 0, errors.New("time: invalid duration " + orig) return 0, errors.New("time: invalid duration " + orig)
} }
scale := 1 scale := 1.0
for n := pl - len(s); n > 0; n-- { for n := pl - len(s); n > 0; n-- {
scale *= 10 scale *= 10
} }
g += float64(x) / float64(scale) g += float64(x) / scale
post = pl != len(s) post = pl != len(s)
} }
if !pre && !post { if !pre && !post {

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

@ -1318,6 +1318,8 @@ var parseDurationTests = []struct {
{"39h9m14.425s", true, 39*Hour + 9*Minute + 14*Second + 425*Millisecond}, {"39h9m14.425s", true, 39*Hour + 9*Minute + 14*Second + 425*Millisecond},
// large value // large value
{"52763797000ns", true, 52763797000 * Nanosecond}, {"52763797000ns", true, 52763797000 * Nanosecond},
// more than 9 digits after decimal point, see http://golang.org/issue/6617
{"0.3333333333333333333h", true, 20 * Minute},
// errors // errors
{"", false, 0}, {"", false, 0},