diff options
| author | David Benjamin <davidben@google.com> | 2020-12-25 12:02:04 -0500 |
|---|---|---|
| committer | Emmanuel Odeke <emmanuel@orijtech.com> | 2021-02-24 04:01:25 +0000 |
| commit | 43652dc46f770253b3603f47165b1568b439b0b5 (patch) | |
| tree | 3af97107b0f79ad061f31d8dac51ef96b5ac16ae /src/bytes | |
| parent | 37805292550e7144200b09320ffb61f21d421f8d (diff) | |
| download | go-43652dc46f770253b3603f47165b1568b439b0b5.tar.gz go-43652dc46f770253b3603f47165b1568b439b0b5.zip | |
bufio, bytes, strings: handle negative runes in WriteRune
Updates #43254
Change-Id: I7d4bf3b99cc36ca2156af5bb01a1c595419d1d3c
Reviewed-on: https://go-review.googlesource.com/c/go/+/280492
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
Reviewed-by: Rob Pike <r@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/bytes')
| -rw-r--r-- | src/bytes/buffer.go | 3 | ||||
| -rw-r--r-- | src/bytes/buffer_test.go | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/bytes/buffer.go b/src/bytes/buffer.go index f19a4cfff0..549b077708 100644 --- a/src/bytes/buffer.go +++ b/src/bytes/buffer.go @@ -275,7 +275,8 @@ func (b *Buffer) WriteByte(c byte) error { // included to match bufio.Writer's WriteRune. The buffer is grown as needed; // if it becomes too large, WriteRune will panic with ErrTooLarge. func (b *Buffer) WriteRune(r rune) (n int, err error) { - if r < utf8.RuneSelf { + // Compare as uint32 to correctly handle negative runes. + if uint32(r) < utf8.RuneSelf { b.WriteByte(byte(r)) return 1, nil } diff --git a/src/bytes/buffer_test.go b/src/bytes/buffer_test.go index fec5ef8a35..9c9b7440ff 100644 --- a/src/bytes/buffer_test.go +++ b/src/bytes/buffer_test.go @@ -6,6 +6,7 @@ package bytes_test import ( . "bytes" + "fmt" "io" "math/rand" "testing" @@ -387,6 +388,16 @@ func TestRuneIO(t *testing.T) { } } +func TestWriteInvalidRune(t *testing.T) { + // Invalid runes, including negative ones, should be written as + // utf8.RuneError. + for _, r := range []rune{-1, utf8.MaxRune + 1} { + var buf Buffer + buf.WriteRune(r) + check(t, fmt.Sprintf("TestWriteInvalidRune (%d)", r), &buf, "\uFFFD") + } +} + func TestNext(t *testing.T) { b := []byte{0, 1, 2, 3, 4} tmp := make([]byte, 5) |