jberman - src/wallet/wallet2.cpp

Co-authored-by: Justin Berman <[email protected]>

Author: nahuhh

src/wallet/wallet2.cpp

@@ -1960,17 +1960,18 @@ void wallet2::set_subaddress_lookahead(size_t major, size_t minor)
   // Expand the subaddresses map so that outputs received to the higher lookaheads will be identified in the scan loop
   hw::device &hwdev = m_account.get_device();
   cryptonote::subaddress_index index2;
-  const uint32_t major_end = get_subaddress_clamped_sum(m_subaddress_labels.size(), major);
+  const uint32_t max_major_idx = this->get_num_subaddress_accounts() > 0 ? (this->get_num_subaddress_accounts() - 1) : 0;
+  const uint32_t major_end = get_subaddress_clamped_sum(max_major_idx, major);
   for (index2.major = 0; index2.major < major_end; ++index2.major)
   {
     // The existing minor addresses already set for this account
     const uint32_t n_minor_subaddrs = this->get_num_subaddresses(index2.major);
 
     // The subaddress lookahead is expected to expand from the max index in expand_subaddresses
-    const uint32_t n_max_idx = n_minor_subaddrs > 0 ? (n_minor_subaddrs - 1) : 0;
-    const uint32_t begin = (n_minor_subaddrs || index2.major < old_major_lookahead) ? get_subaddress_clamped_sum(n_max_idx, old_minor_lookahead) : 0;
+    const uint32_t max_minor_idx = n_minor_subaddrs > 0 ? (n_minor_subaddrs - 1) : 0;
+    const uint32_t begin = (n_minor_subaddrs || index2.major < old_major_lookahead) ? get_subaddress_clamped_sum(max_minor_idx, old_minor_lookahead) : 0;
     // The expected new n minor subaddresses allocated for this account
-    const uint32_t end = get_subaddress_clamped_sum(n_max_idx, minor);
+    const uint32_t end = get_subaddress_clamped_sum(max_minor_idx, minor);
 
     if (begin >= end)
       continue;