kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00
Code Issues Projects Releases Wiki Activity

versioncontrol: Prevent a use-after-free in UpdateItemStatesThread

Browse Source 
UpdateItemStatesThread kept a pointer reference to m_plugin whose
lifetime was tied to VersionControlObserver parents.
On application shutdown it could happen the thread is still running when
the Observer is destroyed.

Make the plugin pointer a weak reference, allowing to stop the thread
when the plugin is gone.

BUG: 477425
This commit is contained in:
Méven Car 2024-03-23 11:55:37 +01:00
parent 5795d57dcb
commit d270700c0e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/versioncontrol/updateitemstatesthread.cpp
View File

@ -26,22 +26,26 @@ UpdateItemStatesThread::~UpdateItemStatesThread()
void UpdateItemStatesThread::run()
{
Q_ASSERT(!m_itemStates.isEmpty());
Q_ASSERT(m_plugin);
if (!m_plugin) {
return;
}
QMutexLocker pluginLocker(m_globalPluginMutex);
QMap<QString, QVector<VersionControlObserver::ItemState>>::iterator it = m_itemStates.begin();
for (; it != m_itemStates.end(); ++it) {
for (; it != m_itemStates.end() && m_plugin; ++it) {
if (m_plugin->beginRetrieval(it.key())) {
QVector<VersionControlObserver::ItemState> &items = it.value();
const int count = items.count();
for (int i = 0; i < count; ++i) {
for (int i = 0; i < count && m_plugin; ++i) {
const KFileItem &item = items.at(i).first;
const KVersionControlPlugin::ItemVersion version = m_plugin->itemVersion(item);
items[i].second = version;
}
}
m_plugin->endRetrieval();
if (m_plugin) {
m_plugin->endRetrieval();
}
}
}

3
src/views/versioncontrol/updateitemstatesthread.h
View File

@ -11,6 +11,7 @@
#include "views/versioncontrol/versioncontrolobserver.h"
#include <QMutex>
#include <QPointer>
#include <QThread>
/**
@ -41,7 +42,7 @@ protected:
private:
QMutex *m_globalPluginMutex; // Protects the m_plugin globally
KVersionControlPlugin *m_plugin;
QPointer<KVersionControlPlugin> m_plugin;
QMap<QString, QVector<VersionControlObserver::ItemState>> m_itemStates;
};