highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-12 04:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move recipients vector checks to beginning of CreateTransaction

Browse Source 
Ensuring that the recipients vector is not empty and that the amounts
are non-negative can be done in CreateTransaction rather than
CreateTransactionInternal. Additionally, these checks should happen as
soon as possible, so they are done at the beginning of
CreateTransaction.
This commit is contained in:
Andrew Chow 2021-05-17 16:23:08 -04:00
parent cd1d6d3324
commit 32ab430651
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/wallet/spend.cpp
View File

@ -586,21 +586,11 @@ bool CWallet::CreateTransactionInternal(
unsigned int outputs_to_subtract_fee_from = 0; // The number of outputs which we are subtracting the fee from
for (const auto& recipient : vecSend)
{
if (recipients_sum < 0 || recipient.nAmount < 0)
{
error = _("Transaction amounts must not be negative");
return false;
}
recipients_sum += recipient.nAmount;
if (recipient.fSubtractFeeFromAmount)
outputs_to_subtract_fee_from++;
}
if (vecSend.empty())
{
error = _("Transaction must have at least one recipient");
return false;
}
CMutableTransaction txNew;
FeeCalculation feeCalc;
@ -897,6 +887,16 @@ bool CWallet::CreateTransaction(
FeeCalculation& fee_calc_out,
bool sign)
{
if (vecSend.empty()) {
error = _("Transaction must have at least one recipient");
return false;
}
if (std::any_of(vecSend.cbegin(), vecSend.cend(), [](const auto& recipient){ return recipient.nAmount < 0; })) {
error = _("Transaction amounts must not be negative");
return false;
}
LOCK(cs_wallet);
int nChangePosIn = nChangePosInOut;