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/bufio | |
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/bufio')
-rw-r--r-- | src/bufio/bufio.go | 3 | ||||
-rw-r--r-- | src/bufio/bufio_test.go | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/bufio/bufio.go b/src/bufio/bufio.go index 6baf9b9e40..ec928e7ad6 100644 --- a/src/bufio/bufio.go +++ b/src/bufio/bufio.go @@ -670,7 +670,8 @@ func (b *Writer) WriteByte(c byte) error { // WriteRune writes a single Unicode code point, returning // the number of bytes written and any error. func (b *Writer) WriteRune(r rune) (size int, err error) { - if r < utf8.RuneSelf { + // Compare as uint32 to correctly handle negative runes. + if uint32(r) < utf8.RuneSelf { err = b.WriteByte(byte(r)) if err != nil { return 0, err diff --git a/src/bufio/bufio_test.go b/src/bufio/bufio_test.go index d7b34bd0d8..ebcc711db9 100644 --- a/src/bufio/bufio_test.go +++ b/src/bufio/bufio_test.go @@ -534,6 +534,20 @@ func TestReadWriteRune(t *testing.T) { } } +func TestWriteInvalidRune(t *testing.T) { + // Invalid runes, including negative ones, should be written as the + // replacement character. + for _, r := range []rune{-1, utf8.MaxRune + 1} { + var buf bytes.Buffer + w := NewWriter(&buf) + w.WriteRune(r) + w.Flush() + if s := buf.String(); s != "\uFFFD" { + t.Errorf("WriteRune(%d) wrote %q, not replacement character", r, s) + } + } +} + func TestReadStringAllocs(t *testing.T) { r := strings.NewReader(" foo foo 42 42 42 42 42 42 42 42 4.2 4.2 4.2 4.2\n") buf := NewReader(r) |