Merge 3f56ef7bef into merged_master (Bitcoin PR bitcoin/bitcoin#22146)

This commit is contained in:
Andrew Poelstra 2021-07-29 07:14:19 +00:00
commit 9fc1ba6008
2 changed files with 8 additions and 3 deletions

View file

@ -5235,6 +5235,14 @@ bool ChainstateManager::PopulateAndValidateSnapshot(
coins_count - coins_left);
return false;
}
if (coin.nHeight > base_height ||
outpoint.n >= std::numeric_limits<decltype(outpoint.n)>::max() // Avoid integer wrap-around in coinstats.cpp:ApplyHash
) {
LogPrintf("[snapshot] bad snapshot data after deserializing %d coins\n",
coins_count - coins_left);
return false;
}
coins_cache.EmplaceCoinInternalDANGER(std::move(outpoint), std::move(coin));
--coins_left;