diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-10-05 10:33:21 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-06 10:48:22 +0000 |
commit | 83a96cbc5113adcecaf5845be9f6c27efa6bf9d2 (patch) | |
tree | 0ae54cbb650b6aaf600bcc629efcdf08939949ad | |
parent | a8ad90665201218fa02b55ef2ed626c23c291036 (diff) |
xdgdesktopportal: properly fix a dangling pointer
The previous fix didn't actually work, as it kept a reference
into a container which could have been muted by the time the
reference was going to be used.
Use an index instead.
Amends 32c09ea5b0f529418eece63de5c3b2c206f62896.
Change-Id: Ib855b4a663c281467e46536b98a0ce2b961f19ee
Task-number: QTBUG-87143
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 45a0c68c8c0b373152f4aec511bc150f431ad9e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp index ae2532e69e..cf3c2c9e9b 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp +++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp @@ -210,7 +210,7 @@ void QXdgDesktopPortalFileDialog::openPortal() qDBusRegisterMetaType<FilterList>(); FilterList filterList; - Filter* selectedFilter = nullptr; + auto selectedFilterIndex = filterList.size() - 1; d->userVisibleToNameFilter.clear(); @@ -236,7 +236,7 @@ void QXdgDesktopPortalFileDialog::openPortal() filterList << filter; if (!d->selectedMimeTypeFilter.isEmpty() && d->selectedMimeTypeFilter == mimeTypefilter) - selectedFilter = &filterList.last(); + selectedFilterIndex = filterList.size() - 1; } } else if (!d->nameFilters.isEmpty()) { for (const QString &nameFilter : d->nameFilters) { @@ -265,7 +265,7 @@ void QXdgDesktopPortalFileDialog::openPortal() d->userVisibleToNameFilter.insert(userVisibleName, nameFilter); if (!d->selectedNameFilter.isEmpty() && d->selectedNameFilter == nameFilter) - selectedFilter = &filterList.last(); + selectedFilterIndex = filterList.size() - 1; } } } @@ -273,9 +273,8 @@ void QXdgDesktopPortalFileDialog::openPortal() if (!filterList.isEmpty()) options.insert(QLatin1String("filters"), QVariant::fromValue(filterList)); - if (selectedFilter) { - options.insert(QLatin1String("current_filter"), QVariant::fromValue(*selectedFilter)); - } + if (selectedFilterIndex != -1) + options.insert(QLatin1String("current_filter"), QVariant::fromValue(filterList[selectedFilterIndex])); options.insert(QLatin1String("handle_token"), QStringLiteral("qt%1").arg(QRandomGenerator::global()->generate())); |