aboutsummaryrefslogtreecommitdiff
path: root/src/net.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-09-10 16:47:40 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-10 16:52:57 +0200
commitd6af9856b0a3140dfa143cd8261efef91f7f3e76 (patch)
tree7a02fe301e87390d1b2f08fefa6daaa92f0986b4 /src/net.cpp
parentf23869e14bf7710f05f128544f2778dde28a01b7 (diff)
parent540ac4514dbe4e077917bad1750768218ef5f9cf (diff)
downloadbitcoin-d6af9856b0a3140dfa143cd8261efef91f7f3e76.tar.xz
Merge pull request #4878
540ac45 Avoid returning many "inv" orphans (Jeff Garzik) d4168c8 Limit CNode::mapAskFor (Wladimir J. van der Laan)
Diffstat (limited to 'src/net.cpp')
-rw-r--r--src/net.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 633a3a34e7..b18944a264 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2106,6 +2106,8 @@ CNode::~CNode()
void CNode::AskFor(const CInv& inv)
{
+ if (mapAskFor.size() > MAPASKFOR_MAX_SZ)
+ return;
// We're using mapAskFor as a priority queue,
// the key is the earliest time the request can be sent
int64_t nRequestTime;