zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6007 

eb63bf8 Fix missing lock in submitblock (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan 2015-04-14 10:49:13 +02:00
parent 9125c08f34 eb63bf86cf
commit d3eb5ae46a
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/rpcmining.cpp
View File

@ -629,14 +629,19 @@ Value submitblock(const Array& params, bool fHelp)
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed"); throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
uint256 hash = block.GetHash(); uint256 hash = block.GetHash();
BlockMap::iterator mi = mapBlockIndex.find(hash); bool fBlockPresent = false;
if (mi != mapBlockIndex.end()) { {
CBlockIndex *pindex = mi->second; LOCK(cs_main);
if (pindex->IsValid(BLOCK_VALID_SCRIPTS)) BlockMap::iterator mi = mapBlockIndex.find(hash);
return "duplicate"; if (mi != mapBlockIndex.end()) {
if (pindex->nStatus & BLOCK_FAILED_MASK) CBlockIndex *pindex = mi->second;
return "duplicate-invalid"; if (pindex->IsValid(BLOCK_VALID_SCRIPTS))
// Otherwise, we might only have the header - process the block before returning return "duplicate";
if (pindex->nStatus & BLOCK_FAILED_MASK)
return "duplicate-invalid";
// Otherwise, we might only have the header - process the block before returning
fBlockPresent = true;
}
} }
CValidationState state; CValidationState state;
@ -644,7 +649,7 @@ Value submitblock(const Array& params, bool fHelp)
RegisterValidationInterface(&sc); RegisterValidationInterface(&sc);
bool fAccepted = ProcessNewBlock(state, NULL, &block); bool fAccepted = ProcessNewBlock(state, NULL, &block);
UnregisterValidationInterface(&sc); UnregisterValidationInterface(&sc);
if (mi != mapBlockIndex.end()) if (fBlockPresent)
{ {
if (fAccepted && !sc.found) if (fAccepted && !sc.found)
return "duplicate-inconclusive"; return "duplicate-inconclusive";