Commit 0fb6f5f2 authored by Adam Langley's avatar Adam Langley

crypto/cipher: don't persist errors in StreamWriter.

I messed this up from the beginning. The receiver isn't a pointer so
setting Err is useless. In order to maintain the API, just remove the
superfluous code.

Fixes #4657.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/7161043
parent 0a40137b
...@@ -28,13 +28,10 @@ func (r StreamReader) Read(dst []byte) (n int, err error) { ...@@ -28,13 +28,10 @@ func (r StreamReader) Read(dst []byte) (n int, err error) {
type StreamWriter struct { type StreamWriter struct {
S Stream S Stream
W io.Writer W io.Writer
Err error Err error // unused
} }
func (w StreamWriter) Write(src []byte) (n int, err error) { func (w StreamWriter) Write(src []byte) (n int, err error) {
if w.Err != nil {
return 0, w.Err
}
c := make([]byte, len(src)) c := make([]byte, len(src))
w.S.XORKeyStream(c, src) w.S.XORKeyStream(c, src)
n, err = w.W.Write(c) n, err = w.W.Write(c)
...@@ -42,7 +39,6 @@ func (w StreamWriter) Write(src []byte) (n int, err error) { ...@@ -42,7 +39,6 @@ func (w StreamWriter) Write(src []byte) (n int, err error) {
if err == nil { // should never happen if err == nil { // should never happen
err = io.ErrShortWrite err = io.ErrShortWrite
} }
w.Err = err
} }
return return
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment