rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 19:33:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

wallet2: fix checking the wrong vector when adding hashes

Browse Source 
The two vectors should be the same size anyway, so add an assert
to catch any case where they aren't
This commit is contained in:
moneromooo-monero 2018-08-04 12:37:39 +00:00
parent b780cf4db1
commit 5b6bcca32a
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View File

@ -1976,9 +1976,11 @@ void wallet2::pull_and_parse_next_blocks(uint64_t start_height, uint64_t &blocks
{ {
drop_from_short_history(short_chain_history, 3); drop_from_short_history(short_chain_history, 3);
THROW_WALLET_EXCEPTION_IF(prev_blocks.size() != prev_parsed_blocks.size(), error::wallet_internal_error, "size mismatch");
// prepend the last 3 blocks, should be enough to guard against a block or two's reorg // prepend the last 3 blocks, should be enough to guard against a block or two's reorg
std::vector<parsed_block>::const_reverse_iterator i = prev_parsed_blocks.rbegin(); std::vector<parsed_block>::const_reverse_iterator i = prev_parsed_blocks.rbegin();
for (size_t n = 0; n < std::min((size_t)3, prev_blocks.size()); ++n) for (size_t n = 0; n < std::min((size_t)3, prev_parsed_blocks.size()); ++n)
{ {
short_chain_history.push_front(i->hash); short_chain_history.push_front(i->hash);
++i; ++i;