correctly handle Read errors/EOF

Read can read data *and* return an error.
libp2p · Mar 8, 2018 · 02aa648 · 02aa648
1 parent c49327c
commit 02aa648
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/p2p/net/pnet/psk_conn.go b/p2p/net/pnet/psk_conn.go
@@ -43,13 +43,10 @@ func (c *pskConn) Read(out []byte) (int, error) {
 
 	in = in[:maxn]            // truncate to required length
 	n, err := c.Conn.Read(in) // read to in
-	if err != nil {
-		return 0, err
+	if n > 0 {
+		c.readS20.XORKeyStream(out[:n], in[:n]) // decrypt to out buffer
 	}
-
-	c.readS20.XORKeyStream(out[:n], in[:n]) // decrypt to out buffer
-
-	return n, nil
+	return n, err
 }
 
 func (c *pskConn) Write(in []byte) (int, error) {