diff options
| author | Emmanuel Odeke <emm.odeke@gmail.com> | 2016-09-28 01:54:38 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-10-01 15:47:35 +0000 |
| commit | 7b40b0c3a332cbfaa1eb17bdafd2ddf12119ec45 (patch) | |
| tree | b7472b36ac1bd223188ba3ba11082b0b328f5f3f /src/strings | |
| parent | d166a369a89ef2d81efdc5d49fa782ee1c0186c4 (diff) | |
| download | go-7b40b0c3a332cbfaa1eb17bdafd2ddf12119ec45.tar.xz | |
strings, bytes: panic if Repeat overflows or if given a negative count
Panic if Repeat is given a negative count or
if the value of (len(*) * count) is detected
to overflow.
We panic because we cannot change the
signature of Repeat to return an error.
Fixes #16237
Change-Id: I9f5ba031a5b8533db0582d7a672ffb715143f3fb
Reviewed-on: https://go-review.googlesource.com/29954
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/strings')
| -rw-r--r-- | src/strings/strings.go | 13 | ||||
| -rw-r--r-- | src/strings/strings_test.go | 49 |
2 files changed, 62 insertions, 0 deletions
diff --git a/src/strings/strings.go b/src/strings/strings.go index c5355db9a2..10922f3c1d 100644 --- a/src/strings/strings.go +++ b/src/strings/strings.go @@ -418,7 +418,20 @@ func Map(mapping func(rune) rune, s string) string { } // Repeat returns a new string consisting of count copies of the string s. +// +// It panics if count is negative or if +// the result of (len(s) * count) overflows. func Repeat(s string, count int) string { + // Since we cannot return an error on overflow, + // we should panic if the repeat will generate + // an overflow. + // See Issue golang.org/issue/16237 + if count < 0 { + panic("strings: negative Repeat count") + } else if count > 0 && len(s)*count/count != len(s) { + panic("strings: Repeat count causes overflow") + } + b := make([]byte, len(s)*count) bp := copy(b, s) for bp < len(b) { diff --git a/src/strings/strings_test.go b/src/strings/strings_test.go index cf7fde5bbd..738185e5dd 100644 --- a/src/strings/strings_test.go +++ b/src/strings/strings_test.go @@ -6,6 +6,7 @@ package strings_test import ( "bytes" + "fmt" "io" "math/rand" "reflect" @@ -892,6 +893,54 @@ func TestRepeat(t *testing.T) { } } +func repeat(s string, count int) (err error) { + defer func() { + if r := recover(); r != nil { + switch v := r.(type) { + case error: + err = v + default: + err = fmt.Errorf("%s", v) + } + } + }() + + Repeat(s, count) + + return +} + +// See Issue golang.org/issue/16237 +func TestRepeatCatchesOverflow(t *testing.T) { + tests := [...]struct { + s string + count int + errStr string + }{ + 0: {"--", -2147483647, "negative"}, + 1: {"", int(^uint(0) >> 1), ""}, + 2: {"-", 10, ""}, + 3: {"gopher", 0, ""}, + 4: {"-", -1, "negative"}, + 5: {"--", -102, "negative"}, + 6: {string(make([]byte, 255)), int((^uint(0))/255 + 1), "overflow"}, + } + + for i, tt := range tests { + err := repeat(tt.s, tt.count) + if tt.errStr == "" { + if err != nil { + t.Errorf("#%d panicked %v", i, err) + } + continue + } + + if err == nil || !Contains(err.Error(), tt.errStr) { + t.Errorf("#%d expected %q got %q", i, tt.errStr, err) + } + } +} + func runesEqual(a, b []rune) bool { if len(a) != len(b) { return false |
