aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2012-09-10 23:40:27 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2012-09-10 23:40:27 +0000
commit1ce15535f050bff064abff01261b64c8f721c0d8 (patch)
treed0b0fa2bfe9a27c6bf3fa7e32db0bf3610a77a12 /src/net.cpp
parentc1124277c5711ded556ea98b0eed1fb7b9081c8d (diff)
downloadbitcoin-1ce15535f050bff064abff01261b64c8f721c0d8.tar.xz
Bugfix: Don't consider invalid listening socket in hSocketMax
Fixed upstream in 8f10a2889089af1b2ac64802360494b54c8c7ff1.
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp
index d2fa111d23..b479ff141e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -843,8 +843,10 @@ void ThreadSocketHandler2(void* parg)
SOCKET hSocketMax = 0;
if(hListenSocket != INVALID_SOCKET)
+ {
FD_SET(hListenSocket, &fdsetRecv);
- hSocketMax = max(hSocketMax, hListenSocket);
+ hSocketMax = max(hSocketMax, hListenSocket);
+ }
CRITICAL_BLOCK(cs_vNodes)
{
BOOST_FOREACH(CNode* pnode, vNodes)