Browse Source

Fix code constness in CBlockIndex::GetAncestor() overloads

Make the non-const overload of CBlockIndex::GetAncestor() reuse the const overload implementation instead of the other way around. This way, the constness of the const overload implementation is guaranteed. The other way around, it was possible to implement the non-const overload in a way which mutates the object, and since that implementation would be called even for const objects (due to the reuse), we would get undefined behavior.
0.16
Dan Raviv 7 years ago
parent
commit
b4058ed9c6
  1. 11
      src/chain.cpp

11
src/chain.cpp

@ -80,12 +80,13 @@ int static inline GetSkipHeight(int height) { @@ -80,12 +80,13 @@ int static inline GetSkipHeight(int height) {
return (height & 1) ? InvertLowestOne(InvertLowestOne(height - 1)) + 1 : InvertLowestOne(height);
}
CBlockIndex* CBlockIndex::GetAncestor(int height)
const CBlockIndex* CBlockIndex::GetAncestor(int height) const
{
if (height > nHeight || height < 0)
if (height > nHeight || height < 0) {
return nullptr;
}
CBlockIndex* pindexWalk = this;
const CBlockIndex* pindexWalk = this;
int heightWalk = nHeight;
while (heightWalk > height) {
int heightSkip = GetSkipHeight(heightWalk);
@ -106,9 +107,9 @@ CBlockIndex* CBlockIndex::GetAncestor(int height) @@ -106,9 +107,9 @@ CBlockIndex* CBlockIndex::GetAncestor(int height)
return pindexWalk;
}
const CBlockIndex* CBlockIndex::GetAncestor(int height) const
CBlockIndex* CBlockIndex::GetAncestor(int height)
{
return const_cast<CBlockIndex*>(this)->GetAncestor(height);
return const_cast<CBlockIndex*>(static_cast<const CBlockIndex*>(this)->GetAncestor(height));
}
void CBlockIndex::BuildSkip()

Loading…
Cancel
Save