From 12570da46ff9de4201ae9f3411db0e955d2993de Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 13 Apr 2012 18:24:55 -0400 Subject: [PATCH] Locking fix for AlreadyHave() Access to mapTransactions[] must be guarded by cs_mapTransactions lock. --- src/main.cpp | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 059dd3d..57c18ae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1953,7 +1953,14 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv) { switch (inv.type) { - case MSG_TX: return mapTransactions.count(inv.hash) || mapOrphanTransactions.count(inv.hash) || txdb.ContainsTx(inv.hash); + case MSG_TX: + CRITICAL_BLOCK(cs_mapTransactions) + { + return mapTransactions.count(inv.hash) || + mapOrphanTransactions.count(inv.hash) || + txdb.ContainsTx(inv.hash); + } + case MSG_BLOCK: return mapBlockIndex.count(inv.hash) || mapOrphanBlocks.count(inv.hash); } // Don't know what it is, just say we already got one -- 1.7.1