qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 15:17:58 -07:00
Code Releases Activity

bufio: bulletproof UnreadRune

Browse Source 
After a fill(), there is nothing to back up.  Make sure UnreadRune
recognizes the situation.

Fixes #1137.
(Stops the crash, but doesn't make UnreadRune usable after a Peek()).

R=rsc
CC=golang-dev
https://golang.org/cl/2498041
This commit is contained in:
Rob Pike 2010-10-13 17:12:43 -07:00
parent d6df301774
commit 52e3c99cfb
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/bufio/bufio.go
View File

@ -226,7 +226,7 @@ func (b *Reader) ReadRune() (rune int, size int, err os.Error) {
// regard it is stricter than UnreadByte, which will unread the last byte // regard it is stricter than UnreadByte, which will unread the last byte
// from any read operation.) // from any read operation.)
func (b *Reader) UnreadRune() os.Error { func (b *Reader) UnreadRune() os.Error {
if b.lastRuneSize < 0 { if b.lastRuneSize < 0 || b.r == 0 {
return ErrInvalidUnreadRune return ErrInvalidUnreadRune
} }
b.r -= b.lastRuneSize b.r -= b.lastRuneSize

9
src/pkg/bufio/bufio_test.go
View File

@ -564,3 +564,12 @@ func TestPeek(t *testing.T) {
t.Fatalf("want EOF got %v", err) t.Fatalf("want EOF got %v", err)
} }
} }
func TestPeekThenUnreadRune(t *testing.T) {
// This sequence used to cause a crash.
r := NewReader(strings.NewReader("x"))
r.ReadRune()
r.Peek(1)
r.UnreadRune()
r.ReadRune() // Used to panic here
}