Browse Source

Merge pull request #5580

1b178a7 Bugfix: ConnectBlock: In case the genesis block gets in with fJustCheck, behave correctly (Luke Dashjr)
228d238 Make CCoinsViewCache's copy constructor private (Luke Dashjr)
0.13
Wladimir J. van der Laan 10 years ago
parent
commit
40d65eb66d
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 5
      src/coins.h
  2. 3
      src/main.cpp

5
src/coins.h

@ -437,6 +437,11 @@ public: @@ -437,6 +437,11 @@ public:
private:
CCoinsMap::iterator FetchCoins(const uint256 &txid);
CCoinsMap::const_iterator FetchCoins(const uint256 &txid) const;
/**
* By making the copy constructor private, we prevent accidentally using it when one intends to create a cache on top of a base cache.
*/
CCoinsViewCache(const CCoinsViewCache &);
};
#endif // BITCOIN_COINS_H

3
src/main.cpp

@ -1718,7 +1718,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin @@ -1718,7 +1718,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
// Special case for the genesis block, skipping connection of its transactions
// (its coinbase is unspendable)
if (block.GetHash() == Params().HashGenesisBlock()) {
view.SetBestBlock(pindex->GetBlockHash());
if (!fJustCheck)
view.SetBestBlock(pindex->GetBlockHash());
return true;
}

Loading…
Cancel
Save