Bugfix: getwork: NULL pindexPrev across CreateNewBlock, in case it fails
This commit is contained in:
parent
776d0f3459
commit
b354251f1a
1 changed files with 9 additions and 1 deletions
10
rpc.cpp
10
rpc.cpp
|
@ -967,8 +967,13 @@ Value getwork(const Array& params, bool fHelp)
|
|||
delete pblock;
|
||||
vNewBlock.clear();
|
||||
}
|
||||
|
||||
// Clear pindexPrev so future getworks make a new block, despite any failures from here on
|
||||
pindexPrev = NULL;
|
||||
|
||||
// Store the pindexBest used before CreateNewBlock, to avoid races
|
||||
nTransactionsUpdatedLast = nTransactionsUpdated;
|
||||
pindexPrev = pindexBest;
|
||||
CBlockIndex* pindexPrevNew = pindexBest;
|
||||
nStart = GetTime();
|
||||
|
||||
// Create new block
|
||||
|
@ -976,6 +981,9 @@ Value getwork(const Array& params, bool fHelp)
|
|||
if (!pblock)
|
||||
throw JSONRPCError(-7, "Out of memory");
|
||||
vNewBlock.push_back(pblock);
|
||||
|
||||
// Need to update only after we know CreateNewBlock succeeded
|
||||
pindexPrev = pindexPrevNew;
|
||||
}
|
||||
|
||||
// Update nTime
|
||||
|
|
Loading…
Reference in a new issue