Browse Source

Assert ConnectBlock block and pIndex are the same block

0.15
NicolasDorier 8 years ago
parent
commit
4d51e9be16
  1. 5
      src/validation.cpp

5
src/validation.cpp

@ -1739,7 +1739,10 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
CCoinsViewCache& view, const CChainParams& chainparams, bool fJustCheck) CCoinsViewCache& view, const CChainParams& chainparams, bool fJustCheck)
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
assert(pindex);
// pindex->phashBlock can be null if called by CreateNewBlock/TestBlockValidity
assert((pindex->phashBlock == NULL) ||
(*pindex->phashBlock == block.GetHash()));
int64_t nTimeStart = GetTimeMicros(); int64_t nTimeStart = GetTimeMicros();
// Check it again in case a previous version let a bad block in // Check it again in case a previous version let a bad block in

Loading…
Cancel
Save