From: Rob Pike <r@golang.org>
Date: Wed, 16 Jun 2010 00:40:47 +0000 (-0700)
Subject: bytes.Buffer.ReadFrom: fix bug.
X-Git-Tag: weekly.2010-06-21~27
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9baa7a51ba117205529b39c8ef738b9f373e5f37;p=gostls13.git

bytes.Buffer.ReadFrom: fix bug.
Fixes #852.

R=rsc
CC=golang-dev
https://golang.org/cl/1680042
---

diff --git a/src/pkg/bytes/buffer.go b/src/pkg/bytes/buffer.go
index 32571d8d8e..01e6aef674 100644
--- a/src/pkg/bytes/buffer.go
+++ b/src/pkg/bytes/buffer.go
@@ -134,7 +134,7 @@ func (b *Buffer) ReadFrom(r io.Reader) (n int64, err os.Error) {
 			b.off = 0
 		}
 		m, e := r.Read(b.buf[len(b.buf):cap(b.buf)])
-		b.buf = b.buf[b.off : len(b.buf)+m]
+		b.buf = b.buf[0 : len(b.buf)+m]
 		n += int64(m)
 		if e == os.EOF {
 			break