cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-22 16:09:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

time: don't panic when stringifying Weekday

Browse Source 
Fixes #24692

Change-Id: I14058cd3968d08fbcfc275f1b13b6dba9e3c5068
Reviewed-on: https://go-review.googlesource.com/106535
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
fraenkel 2018-04-11 21:18:58 -04:00 committed by Brad Fitzpatrick
parent 2dfb423e6e
commit 94ef1dafbd
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/time/time.go
View File

@ -323,7 +323,14 @@ var days = [...]string{
} }
// String returns the English name of the day ("Sunday", "Monday", ...). // String returns the English name of the day ("Sunday", "Monday", ...).
func (d Weekday) String() string { return days[d] } func (d Weekday) String() string {
if Sunday <= d && d <= Saturday {
return days[d]
}
buf := make([]byte, 20)
n := fmtInt(buf, uint64(d))
return "%!Weekday(" + string(buf[n:]) + ")"
}
// Computations on time. // Computations on time.
// //

12
src/time/time_test.go
View File

@ -673,7 +673,7 @@ var gobTests = []Time{
Date(0, 1, 2, 3, 4, 5, 6, UTC), Date(0, 1, 2, 3, 4, 5, 6, UTC),
Date(7, 8, 9, 10, 11, 12, 13, FixedZone("", 0)), Date(7, 8, 9, 10, 11, 12, 13, FixedZone("", 0)),
Unix(81985467080890095, 0x76543210), // Time.sec: 0x0123456789ABCDEF Unix(81985467080890095, 0x76543210), // Time.sec: 0x0123456789ABCDEF
{}, // nil location {}, // nil location
Date(1, 2, 3, 4, 5, 6, 7, FixedZone("", 32767*60)), Date(1, 2, 3, 4, 5, 6, 7, FixedZone("", 32767*60)),
Date(1, 2, 3, 4, 5, 6, 7, FixedZone("", -32768*60)), Date(1, 2, 3, 4, 5, 6, 7, FixedZone("", -32768*60)),
} }
@ -1319,6 +1319,16 @@ func TestZeroMonthString(t *testing.T) {
} }
} }
// Issue 24692: Out of range weekday panics
func TestWeekdayString(t *testing.T) {
if got, want := Weekday(Tuesday).String(), "Tuesday"; got != want {
t.Errorf("Tuesday weekday = %q; want %q", got, want)
}
if got, want := Weekday(14).String(), "%!Weekday(14)"; got != want {
t.Errorf("14th weekday = %q; want %q", got, want)
}
}
func TestReadFileLimit(t *testing.T) { func TestReadFileLimit(t *testing.T) {
const zero = "/dev/zero" const zero = "/dev/zero"
if _, err := os.Stat(zero); err != nil { if _, err := os.Stat(zero); err != nil {