diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-03-24 20:09:11 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-03-25 19:16:39 +0000 |
| commit | b878d8db66faf9f8d9b2ff394123cdde21d93f8d (patch) | |
| tree | bcb5fb7c855109415b5dc41497648d926d7082f5 /src/bufio/scan.go | |
| parent | fcb8f8384ac62eb029926bb1f3602825fa61b261 (diff) | |
| download | go-b878d8db66faf9f8d9b2ff394123cdde21d93f8d.tar.xz | |
bufio: don't panic when Scanner sees an impossible Read count
Fixes #38053
Change-Id: Ib0f9777f37eeaa07eb8ecb6df3e97e9d4b46dcd8
Reviewed-on: https://go-review.googlesource.com/c/go/+/225357
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/bufio/scan.go')
| -rw-r--r-- | src/bufio/scan.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bufio/scan.go b/src/bufio/scan.go index 4e787c4b0a..976b5994eb 100644 --- a/src/bufio/scan.go +++ b/src/bufio/scan.go @@ -211,6 +211,10 @@ func (s *Scanner) Scan() bool { // be extra careful: Scanner is for safe, simple jobs. for loop := 0; ; { n, err := s.r.Read(s.buf[s.end:len(s.buf)]) + if n < 0 || n > len(s.buf)-s.end { + n = 0 + err = errors.New("bufio.Scanner: Read returned impossible count") + } s.end += n if err != nil { s.setErr(err) |