From 26d250bbead9758f386df717dc652e3043344ee8 Mon Sep 17 00:00:00 2001
From: Ignotus Peverell <igno.peverell@protonmail.com>
Date: Wed, 9 Jan 2019 20:24:57 +0000
Subject: [PATCH] Fix borrow error

---
 p2p/src/serv.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/p2p/src/serv.rs b/p2p/src/serv.rs
index 99a1ab828..a0cb73d3b 100644
--- a/p2p/src/serv.rs
+++ b/p2p/src/serv.rs
@@ -86,9 +86,6 @@ impl Server {
 					if !self.check_banned(&stream) {
 						let sc = stream.try_clone();
 						if let Err(e) = self.handle_new_peer(stream) {
-							// in theory, should be shutdown when stream gets dropped,
-							// practically doesn't seem to be happening
-							stream.shutdown(Shutdown::Both);
 							warn!("Error accepting peer {}: {:?}", peer_addr.to_string(), e);
 						} else if let Ok(s) = sc {
 							connected_sockets.insert(peer_addr, s);
@@ -176,13 +173,21 @@ impl Server {
 		let total_diff = self.peers.total_difficulty();
 
 		// accept the peer and add it to the server map
-		let mut peer = Peer::accept(
+		let mut peer = match Peer::accept(
 			&mut stream,
 			self.capabilities,
 			total_diff,
 			&self.handshake,
 			self.peers.clone(),
-		)?;
+		) {
+			Ok(p) => p,
+			Err(e) => {
+				// in theory, should be shutdown when stream gets dropped,
+				// practically doesn't seem to be happening
+				let _ = stream.shutdown(Shutdown::Both);
+				return Err(e);
+			}
+		};
 		peer.start(stream);
 		self.peers.add_connected(Arc::new(peer))?;
 		Ok(())