Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

SubaddressAccount: fix use-after-free bug

Browse Source
This commit is contained in:
xiphon
2019-12-17 14:18:54 +00:00
parent c9900c05b2
commit e0ab9aa898
3 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/model/SubaddressAccountModel.cpp
View File

@@ -59,22 +59,28 @@ QVariant SubaddressAccountModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.row() < 0 || (unsigned)index.row() >= m_subaddressAccount->count())
return {};
Monero::SubaddressAccountRow * sr = m_subaddressAccount->getRow(index.row());
QVariant result;
QVariant result = "";
switch (role) {
case SubaddressAccountAddressRole:
result = QString::fromStdString(sr->getAddress());
break;
case SubaddressAccountLabelRole:
result = QString::fromStdString(sr->getLabel());
break;
case SubaddressAccountBalanceRole:
result = QString::fromStdString(sr->getBalance());
break;
case SubaddressAccountUnlockedBalanceRole:
result = QString::fromStdString(sr->getUnlockedBalance());
break;
bool found = m_subaddressAccount->getRow(index.row(), [&result, &role](const Monero::SubaddressAccountRow &row) {
switch (role) {
case SubaddressAccountAddressRole:
result = QString::fromStdString(row.getAddress());
break;
case SubaddressAccountLabelRole:
result = QString::fromStdString(row.getLabel());
break;
case SubaddressAccountBalanceRole:
result = QString::fromStdString(row.getBalance());
break;
case SubaddressAccountUnlockedBalanceRole:
result = QString::fromStdString(row.getUnlockedBalance());
break;
default:
qCritical() << "Unimplemented role" << role;
}
});
if (!found) {
qCritical("%s: internal error: invalid index %d", __FUNCTION__, index.row());
}
return result;