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

Merge pull request #2627

Browse Source 
8c51172 Subaddress: fix use-after-free on accessing stale Wallet API data (xiphon)
This commit is contained in:
luigi1111
2019-12-19 19:46:45 -05:00
parent b963028f10 8c511722e0
commit f2424ddeaa
3 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/model/SubaddressModel.cpp
View File

@@ -60,18 +60,23 @@ QVariant SubaddressModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.row() < 0 || (unsigned)index.row() >= m_subaddress->count())
return {};
Monero::SubaddressRow * sr = m_subaddress->getRow(index.row());
if (!sr)
return {};
QVariant result;
QVariant result = "";
switch (role) {
case SubaddressAddressRole:
result = QString::fromStdString(sr->getAddress());
break;
case SubaddressLabelRole:
result = index.row() == 0 ? tr("Primary address") : QString::fromStdString(sr->getLabel());
break;
bool found = m_subaddress->getRow(index.row(), [&index, &result, &role](const Monero::SubaddressRow &subaddress) {
switch (role) {
case SubaddressAddressRole:
result = QString::fromStdString(subaddress.getAddress());
break;
case SubaddressLabelRole:
result = index.row() == 0 ? tr("Primary address") : QString::fromStdString(subaddress.getLabel());
break;
default:
qCritical() << "Unimplemented role" << role;
}
});
if (!found)
{
qCritical("%s: internal error: invalid index %d", __FUNCTION__, index.row());
}
return result;