Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When rewinding, reset pindexBestInvalid if it is pointing to a removed block #3166

Merged
merged 1 commit into from
Apr 12, 2018
Merged

When rewinding, reset pindexBestInvalid if it is pointing to a removed block #3166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4058,6 +4058,10 @@ bool RewindBlockIndex(const CChainParams& params)
if (!sufficientlyValidated(pindexIter) && !chainActive.Contains(pindexIter)) {
// Add to the list of blocks to remove
vBlocks.push_back(pindexIter);
if (pindexIter == pindexBestInvalid) {
// Reset invalid block marker if it was pointing to this block
pindexBestInvalid = NULL;
}
// Update indices
setBlockIndexCandidates.erase(pindexIter);
auto ret = mapBlocksUnlinked.equal_range(pindexIter->pprev);
Expand Down