Skip to content

Commit b13d3b7

Browse files
committed
SSHConn.Read: fix return dropped error on err != io.EOF
and unify return style in other r/w operations
1 parent 26c3328 commit b13d3b7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: dial.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func (conn *SSHConn) Read(p []byte) (int, error) {
8989
if err != nil && err != io.EOF {
9090
return n, &IOError{err}
9191
}
92-
return n, nil
92+
return n, err
9393
}
9494

9595
// Write implements io.Writer.
@@ -99,7 +99,7 @@ func (conn *SSHConn) Write(p []byte) (int, error) {
9999
if err != nil {
100100
return n, &IOError{err}
101101
}
102-
return n, nil
102+
return n, err
103103
}
104104

105105
func (conn *SSHConn) CloseWrite() error {

Diff for: serve.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (f *ServeConn) Read(p []byte) (n int, err error) {
118118
if err != nil && err != io.EOF {
119119
err = &IOError{err}
120120
}
121-
return
121+
return n, err
122122
}
123123

124124
// Write implements io.Writer.
@@ -128,7 +128,7 @@ func (f *ServeConn) Write(p []byte) (n int, err error) {
128128
if err != nil {
129129
err = &IOError{err}
130130
}
131-
return
131+
return n, err
132132
}
133133

134134
func (f *ServeConn) Close() (err error) {

0 commit comments

Comments
 (0)