wallet2: Missing underflow check on low heights

Lack of it results in `m_refresh_from_block_height` being < 0 (18446744...) on low heights, which blocks `process_new_blockchain_entry` and never process coins on heights less than blocks_per_month.
Follow-up to #2258
This commit is contained in:
landergate 2017-09-27 14:17:48 +03:00 committed by GitHub
parent 5f7cddeb53
commit 180a848cbe

View File

@ -2209,7 +2209,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const std::stri
// Set blockchain height calculated from current date/time // Set blockchain height calculated from current date/time
uint64_t approx_blockchain_height = get_approximate_blockchain_height(); uint64_t approx_blockchain_height = get_approximate_blockchain_height();
if(approx_blockchain_height > 0) { if(approx_blockchain_height > 0) {
m_refresh_from_block_height = approx_blockchain_height - blocks_per_month; m_refresh_from_block_height = approx_blockchain_height >= blocks_per_month ? approx_blockchain_height - blocks_per_month : 0;
} }
} }
bool r = store_keys(m_keys_file, password, false); bool r = store_keys(m_keys_file, password, false);