Merge pull request #2020

6cb1ad1f wallet fix: ensure iterator to be valid (stoffu)
This commit is contained in:
Riccardo Spagni 2017-05-30 21:14:24 +02:00
commit 024860b49d
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -4266,7 +4266,10 @@ std::vector<wallet2::pending_tx> wallet2::create_transactions_2(std::vector<cryp
std::vector<cryptonote::tx_destination_entry>::iterator i; std::vector<cryptonote::tx_destination_entry>::iterator i;
i = std::find_if(dsts.begin(), dsts.end(), [&](const cryptonote::tx_destination_entry &d) { return !memcmp (&d.addr, &addr, sizeof(addr)); }); i = std::find_if(dsts.begin(), dsts.end(), [&](const cryptonote::tx_destination_entry &d) { return !memcmp (&d.addr, &addr, sizeof(addr)); });
if (i == dsts.end()) if (i == dsts.end())
{
dsts.push_back(tx_destination_entry(0,addr)); dsts.push_back(tx_destination_entry(0,addr));
i = dsts.end() - 1;
}
i->amount += amount; i->amount += amount;
} }
else else