aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-06 21:31:32 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-06 21:31:32 +0200
commitd210d6fb459d4542d887f55504820a17a760a605 (patch)
tree32451abf193beff615ea41c0278023f2b6e3da2e /src
parentMerge pull request #4735 (diff)
parentwallet2: fix ring reuse breaking when using histogram (diff)
downloadmonero-d210d6fb459d4542d887f55504820a17a760a605.tar.xz
Merge pull request #4738
107f3398 wallet2: fix ring reuse breaking when using histogram (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 9f2a9f426..82813d442 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -7215,6 +7215,9 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
break;
}
}
+ bool use_histogram = amount != 0 || !has_rct_distribution;
+ if (!use_histogram)
+ num_outs = rct_offsets[rct_offsets.size() - CRYPTONOTE_DEFAULT_TX_SPENDABLE_AGE];
// make sure the real outputs we asked for are really included, along
// with the correct key and mask: this guards against an active attack