Merge 5d6f6fd00d into merged_master (Bitcoin PR bitcoin/bitcoin#31490)

This commit is contained in:
ikripaka 2026-04-10 11:53:22 +00:00
commit bde05e1016
No known key found for this signature in database
21 changed files with 181 additions and 206 deletions

View file

@ -442,7 +442,7 @@ bool FillBlock(const CBlockIndex* index, const FoundBlock& block, UniqueLock<Rec
if (block.m_next_block) FillBlock(active[index->nHeight] == index ? active[index->nHeight + 1] : nullptr, *block.m_next_block, lock, active, blockman);
if (block.m_data) {
REVERSE_LOCK(lock);
if (!blockman.ReadBlockFromDisk(*block.m_data, *index)) block.m_data->SetNull();
if (!blockman.ReadBlock(*block.m_data, *index)) block.m_data->SetNull();
}
block.found = true;
return true;