4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 04:16:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5501

Browse Source 
b4ca72dd wallet2: fix infinite loop picking outputs in corner case (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-05-07 17:32:33 +02:00
commit ebb1c03e8c
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/wallet2.cpp
View File

@ -1003,7 +1003,7 @@ uint64_t gamma_picker::pick()
const uint64_t n_rct = rct_offsets[index] - first_rct; const uint64_t n_rct = rct_offsets[index] - first_rct;
if (n_rct == 0) if (n_rct == 0)
return std::numeric_limits<uint64_t>::max(); // bad pick return std::numeric_limits<uint64_t>::max(); // bad pick
MDEBUG("Picking 1/" << n_rct << " in block " << index); MTRACE("Picking 1/" << n_rct << " in block " << index);
return first_rct + crypto::rand_idx(n_rct); return first_rct + crypto::rand_idx(n_rct);
}; };
@ -7761,7 +7761,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
} }
} }
if (num_outs <= requested_outputs_count && !existing_ring_found) if (num_outs <= requested_outputs_count)
{ {
for (uint64_t i = 0; i < num_outs; i++) for (uint64_t i = 0; i < num_outs; i++)
req.outputs.push_back({amount, i}); req.outputs.push_back({amount, i});
@ -7787,6 +7787,8 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
// while we still need more mixins // while we still need more mixins
uint64_t num_usable_outs = num_outs; uint64_t num_usable_outs = num_outs;
bool allow_blackballed = false; bool allow_blackballed = false;
MDEBUG("Starting gamma picking with " << num_outs << ", num_usable_outs " << num_usable_outs
<< ", requested_outputs_count " << requested_outputs_count);
while (num_found < requested_outputs_count) while (num_found < requested_outputs_count)
{ {
// if we've gone through every possible output, we've gotten all we can // if we've gone through every possible output, we've gotten all we can
@ -7886,6 +7888,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
picks[type].insert(i); picks[type].insert(i);
req.outputs.push_back({amount, i}); req.outputs.push_back({amount, i});
++num_found; ++num_found;
MDEBUG("picked " << i << ", " << num_found << " now picked");
} }
for (const auto &pick: picks) for (const auto &pick: picks)