diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-02 15:13:42 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-02 15:15:44 +0100 |
| commit | 59ce53c13cfca85418fad039538acb3bd21bbcf4 (patch) | |
| tree | 3c2967726c443c48ec74a57c0df8f92eecee2138 /src/main.cpp | |
| parent | 2e2388a5cbb9a6e101b36e4501698fec538a5738 (diff) | |
| parent | b16cdb71ff20ebf23372d116e9bb4bbe84d30fce (diff) | |
| download | bitcoin-59ce53c13cfca85418fad039538acb3bd21bbcf4.tar.xz | |
Merge #9011: 0.13.2 backports
b16cdb7 Add MIT license to build-aux/m4 scripts (Luke Dashjr)
2cfcca7 Trivial: build-aux/m4/l_atomic: Fix typo (Luke Dashjr)
fa58e55 Add MIT license to autogen.sh and share/genbuild.sh (Luke Dashjr)
6d05fe1 Add MIT license to Makefiles (Luke Dashjr)
1d048b9 Don't return the address of a P2SH of a P2SH. (jnewbery)
ce0d817 Fix relaypriority calculation error (maiiz)
9ef3875 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 61d0aaf0b9..84f4607dba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5388,6 +5388,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, BlockTransactionsRequest req; vRecv >> req; + LOCK(cs_main); + BlockMap::iterator it = mapBlockIndex.find(req.blockhash); if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) { LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id); |