GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MERGE FIX: ConnectTip: ub fix for bench

Browse source
This commit is contained in:
Gregory Sanders 2019-01-29 13:04:37 +00:00
parent 80857b3299
commit 4f4fe8f6c7
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -1884,6 +1884,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
} }
view.SetBestBlock(pindex->GetBlockHash()); view.SetBestBlock(pindex->GetBlockHash());
} }
nBlocksTotal++;
return true; return true;
} }
@ -1950,6 +1951,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
} }
int64_t nTime1 = GetTimeMicros(); nTimeCheck += nTime1 - nTimeStart; int64_t nTime1 = GetTimeMicros(); nTimeCheck += nTime1 - nTimeStart;
assert(nBlocksTotal > 0);
LogPrint(BCLog::BENCH, " - Sanity checks: %.2fms [%.2fs (%.2fms/blk)]\n", MILLI * (nTime1 - nTimeStart), nTimeCheck * MICRO, nTimeCheck * MILLI / nBlocksTotal); LogPrint(BCLog::BENCH, " - Sanity checks: %.2fms [%.2fs (%.2fms/blk)]\n", MILLI * (nTime1 - nTimeStart), nTimeCheck * MICRO, nTimeCheck * MILLI / nBlocksTotal);
// Do not allow blocks that contain transactions which 'overwrite' older transactions, // Do not allow blocks that contain transactions which 'overwrite' older transactions,