Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-02 14:37:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

AddressBook: thread-safety, fix use-after-free

Browse Source
This commit is contained in:
xiphon
2020-02-01 14:21:33 +00:00
parent 6de8547047
commit 742a4659f4
3 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/model/AddressBookModel.cpp
View File

@@ -57,30 +57,27 @@ int AddressBookModel::rowCount(const QModelIndex &) const
QVariant AddressBookModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
return QVariant();
QVariant result;
if (index.row() < 0 || (unsigned)index.row() >= m_addressBook->count()) {
return QVariant();
}
Monero::AddressBookRow * ar = m_addressBook->getRow(index.row());
QVariant result = "";
switch (role) {
case AddressBookAddressRole:
result = QString::fromStdString(ar->getAddress());
break;
case AddressBookDescriptionRole:
result = QString::fromStdString(ar->getDescription());
break;
case AddressBookPaymentIdRole:
result = QString::fromStdString(ar->getPaymentId());
break;
case AddressBookRowIdRole:
// Qt doesnt support size_t overload type casting
result.setValue(ar->getRowId());
break;
bool found = m_addressBook->getRow(index.row(), [&result, &role](const Monero::AddressBookRow &row) {
switch (role) {
case AddressBookAddressRole:
result = QString::fromStdString(row.getAddress());
break;
case AddressBookDescriptionRole:
result = QString::fromStdString(row.getDescription());
break;
case AddressBookPaymentIdRole:
result = QString::fromStdString(row.getPaymentId());
break;
case AddressBookRowIdRole:
// Qt doesnt support size_t overload type casting
result.setValue(row.getRowId());
break;
}
});
if (!found) {
qCritical("%s: internal error: invalid index %d", __FUNCTION__, index.row());
}
return result;