aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlandergate <landergate@landergate.com>2017-09-27 14:17:48 +0300
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-10-15 11:17:54 +0100
commit44afa6de07c88bc9d8d5ea65635433d4cdfcaad0 (patch)
treeaaa2a99ec373db686387d44bdc706cf43ed69f7f
parentMerge pull request #2448 (diff)
downloadmonero-44afa6de07c88bc9d8d5ea65635433d4cdfcaad0.tar.xz
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
-rw-r--r--src/wallet/wallet2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 6c34c3fd4..23fcf986e 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -2255,7 +2255,7 @@ crypto::secret_key wallet2::generate(const std::string& wallet_, const std::stri
// Set blockchain height calculated from current date/time
uint64_t approx_blockchain_height = get_approximate_blockchain_height();
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);