zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

qt: add missing cs_wallet lock in AddressTableModel::setData 

duplicate check in AddressTableModel::setData accesses
wallet data structure as well as SetAddressBook without proper LOCK, fix this.
This commit is contained in:
Wladimir J. van der Laan 2013-12-12 10:12:27 +01:00
parent 7aedb91476
commit 4757e92318
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/qt/addresstablemodel.cpp
View File

@ -244,33 +244,34 @@ bool AddressTableModel::setData(const QModelIndex &index, const QVariant &value,
if(role == Qt::EditRole) if(role == Qt::EditRole)
{ {
switch(index.column()) LOCK(wallet->cs_wallet); /* For SetAddressBook / DelAddressBook */
CTxDestination curAddress = CBitcoinAddress(rec->address.toStdString()).Get();
if(index.column() == Label)
{ {
case Label:
// Do nothing, if old label == new label // Do nothing, if old label == new label
if(rec->label == value.toString()) if(rec->label == value.toString())
{ {
editStatus = NO_CHANGES; editStatus = NO_CHANGES;
return false; return false;
} }
wallet->SetAddressBook(CBitcoinAddress(rec->address.toStdString()).Get(), value.toString().toStdString(), strPurpose); wallet->SetAddressBook(curAddress, value.toString().toStdString(), strPurpose);
break; } else if(index.column() == Address) {
case Address: CTxDestination newAddress = CBitcoinAddress(value.toString().toStdString()).Get();
// Do nothing, if old address == new address
if(CBitcoinAddress(rec->address.toStdString()) == CBitcoinAddress(value.toString().toStdString()))
{
editStatus = NO_CHANGES;
return false;
}
// Refuse to set invalid address, set error status and return false // Refuse to set invalid address, set error status and return false
else if(!walletModel->validateAddress(value.toString())) if(boost::get<CNoDestination>(&newAddress))
{ {
editStatus = INVALID_ADDRESS; editStatus = INVALID_ADDRESS;
return false; return false;
} }
// Do nothing, if old address == new address
else if(newAddress == curAddress)
{
editStatus = NO_CHANGES;
return false;
}
// Check for duplicate addresses to prevent accidental deletion of addresses, if you try // Check for duplicate addresses to prevent accidental deletion of addresses, if you try
// to paste an existing address over another address (with a different label) // to paste an existing address over another address (with a different label)
else if(wallet->mapAddressBook.count(CBitcoinAddress(value.toString().toStdString()).Get())) else if(wallet->mapAddressBook.count(newAddress))
{ {
editStatus = DUPLICATE_ADDRESS; editStatus = DUPLICATE_ADDRESS;
return false; return false;
@ -278,15 +279,11 @@ bool AddressTableModel::setData(const QModelIndex &index, const QVariant &value,
// Double-check that we're not overwriting a receiving address // Double-check that we're not overwriting a receiving address
else if(rec->type == AddressTableEntry::Sending) else if(rec->type == AddressTableEntry::Sending)
{ {
{ // Remove old entry
LOCK(wallet->cs_wallet); wallet->DelAddressBook(curAddress);
// Remove old entry // Add new entry with new address
wallet->DelAddressBook(CBitcoinAddress(rec->address.toStdString()).Get()); wallet->SetAddressBook(newAddress, rec->label.toStdString(), strPurpose);
// Add new entry with new address
wallet->SetAddressBook(CBitcoinAddress(value.toString().toStdString()).Get(), rec->label.toStdString(), strPurpose);
}
} }
break;
} }
return true; return true;
} }