From 04dabe84b22aa9db501c2d88b4e6ffa0749598ce Mon Sep 17 00:00:00 2001 From: Simeon Bird Date: Fri, 19 Oct 2012 21:04:55 -0400 Subject: [PATCH] Fix race condition and deadlock in the version plugin when listing directories is slow. BUG: 302264 FIXED-IN: 4.9.3 --- src/views/versioncontrol/updateitemstatesthread.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp index f9746aadd..e07d72c76 100644 --- a/src/views/versioncontrol/updateitemstatesthread.cpp +++ b/src/views/versioncontrol/updateitemstatesthread.cpp @@ -45,10 +45,12 @@ UpdateItemStatesThread::~UpdateItemStatesThread() void UpdateItemStatesThread::setData(KVersionControlPlugin* plugin, const QList& itemStates) { + // The locks are taken in the same order as in run() + // to avoid potential deadlock. + QMutexLocker pluginLocker(m_globalPluginMutex); QMutexLocker itemLocker(&m_itemMutex); - m_itemStates = itemStates; - QMutexLocker pluginLocker(m_globalPluginMutex); + m_itemStates = itemStates; m_plugin = plugin; } @@ -58,11 +60,12 @@ void UpdateItemStatesThread::run() Q_ASSERT(m_plugin); QMutexLocker itemLocker(&m_itemMutex); + const QString directory = m_itemStates.first().item.url().directory(KUrl::AppendTrailingSlash); + m_retrievedItems = false; itemLocker.unlock(); QMutexLocker pluginLocker(m_globalPluginMutex); - m_retrievedItems = false; if (m_plugin->beginRetrieval(directory)) { itemLocker.relock(); const int count = m_itemStates.count(); -- 2.47.3