LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Bugfix: getmemorypool: NULL pindexPrev across CreateNewBlock, in case it fails

Browse source
This commit is contained in:
Luke Dashjr 2012-05-09 17:08:39 +00:00
parent 5146599b01
commit 5d53f48acb
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bitcoinrpc.cpp
View file

@ -1760,16 +1760,26 @@ Value getmemorypool(const Array& params, bool fHelp)
if (pindexPrev != pindexBest || if (pindexPrev != pindexBest ||
(nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5)) (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5))
{ {
// Clear pindexPrev so future calls make a new block, despite any failures from here on
pindexPrev = NULL;
// Store the pindexBest used before CreateNewBlock, to avoid races
nTransactionsUpdatedLast = nTransactionsUpdated; nTransactionsUpdatedLast = nTransactionsUpdated;
pindexPrev = pindexBest; CBlockIndex* pindexPrevNew = pindexBest;
nStart = GetTime(); nStart = GetTime();
// Create new block // Create new block
if(pblock) if(pblock)
{
delete pblock; delete pblock;
pblock = NULL;
}
pblock = CreateNewBlock(reservekey); pblock = CreateNewBlock(reservekey);
if (!pblock) if (!pblock)
throw JSONRPCError(-7, "Out of memory"); throw JSONRPCError(-7, "Out of memory");
// Need to update only after we know CreateNewBlock succeeded
pindexPrev = pindexPrevNew;
} }
// Update nTime // Update nTime