Skip to content

Commit d2b3c25

Browse files
authored
fix some error checks (#457) by @drakkan
The following commit reversed the logic of some error checks 8cdfc8d
1 parent bfb6dd6 commit d2b3c25

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

driver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func NewTestServerWithDriverAndLogger(t *testing.T, driver MainDriver, logger lo
105105
})
106106

107107
go func() {
108-
if err := server.Serve(); err != nil && errors.Is(err, io.EOF) {
108+
if err := server.Serve(); err != nil && !errors.Is(err, io.EOF) {
109109
server.Logger.Error("problem serving", "err", err)
110110
}
111111
}()

handle_files.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (c *clientHandler) doFileTransfer(transferConn net.Conn, file io.ReadWriter
146146
}
147147

148148
// for reads io.EOF isn't an error, for writes it must be considered an error
149-
if written, errCopy := io.Copy(writer, reader); errCopy != nil && (errors.Is(errCopy, io.EOF) || write) {
149+
if written, errCopy := io.Copy(writer, reader); errCopy != nil && (!errors.Is(errCopy, io.EOF) || write) {
150150
err = errCopy
151151
} else {
152152
c.logger.Debug(
@@ -704,7 +704,7 @@ func (c *clientHandler) computeHashForFile(filePath string, algo HASHAlgo, start
704704

705705
_, err = io.CopyN(chosenHashAlgo, file, end-start)
706706

707-
if err != nil && errors.Is(err, io.EOF) {
707+
if err != nil && !errors.Is(err, io.EOF) {
708708
return "", newFileAccessError("couldn't read file", err)
709709
}
710710

0 commit comments

Comments
 (0)