File 0001-Fix-crash-when-multiple-EDID-requests-for-... of Package libkscreen2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-crash-when-multiple-EDID-requests-for-the-same-o.patch of Package libkscreen2 (Revision 7041154290aaaa04a8493fcf09ecebbd)

Currently displaying revision 7041154290aaaa04a8493fcf09ecebbd , Show latest

From d3aa0f06fd6b657071aae7235472267498b4703f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Thu, 29 Jan 2015 16:30:54 +0100
Subject: [PATCH 1/1] Fix crash when multiple EDID requests for the same output
 are enqueued

When the first EDID date are delivered, the output is removed from
the list of pending requests, causing crash when response to the second
request arrives.

This fix makes the code more robust by allowing multiple request for the
same output per single config as well as handling multiple configs.

BUG: 343482
FIXED-IN: 5.2.1
---
 src/configmonitor.cpp | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/configmonitor.cpp b/src/configmonitor.cpp
index d3f7807469db7ed82410078c201fd5839f0cad2a..727f1e0a68dba589620f02d1f40b7f75b03fa444 100644
--- a/src/configmonitor.cpp
+++ b/src/configmonitor.cpp
@@ -50,8 +50,7 @@ public:
     QPointer<org::kde::kscreen::Backend> mBackend;
     bool mFirstBackend;
 
-    QSet<int> mPendingEDIDRequests;
-    KScreen::ConfigPtr mPendingConfigUpdate;
+    QMap<KScreen::ConfigPtr, QList<int>> mPendingEDIDRequests;
 private:
     ConfigMonitor *q;
 };
@@ -117,17 +116,17 @@ void ConfigMonitor::Private::backendConfigChanged(const QVariantMap &configMap)
     Q_FOREACH (OutputPtr output, newConfig->connectedOutputs()) {
         if (!output->edid() && output->isConnected()) {
             QDBusPendingReply<QByteArray> reply = mBackend->getEdid(output->id());
-            mPendingEDIDRequests.insert(output->id());
+            mPendingEDIDRequests[newConfig].append(output->id());
             QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply);
             watcher->setProperty("outputId", output->id());
+            watcher->setProperty("config", QVariant::fromValue(newConfig));
             connect(watcher, &QDBusPendingCallWatcher::finished,
                     this, &ConfigMonitor::Private::edidReady);
         }
     }
 
-    if (!mPendingEDIDRequests.isEmpty()) {
-        qCDebug(KSCREEN) << "Requesting missing EDID for outputs" << mPendingEDIDRequests;
-        mPendingConfigUpdate = newConfig;
+    if (mPendingEDIDRequests.contains(newConfig)) {
+        qCDebug(KSCREEN) << "Requesting missing EDID for outputs" << mPendingEDIDRequests[newConfig];
     } else {
         updateConfigs(newConfig);
     }
@@ -136,31 +135,27 @@ void ConfigMonitor::Private::backendConfigChanged(const QVariantMap &configMap)
 void ConfigMonitor::Private::edidReady(QDBusPendingCallWatcher* watcher)
 {
     const int outputId = watcher->property("outputId").toInt();
-    Q_ASSERT(!mPendingConfigUpdate.isNull());
-    Q_ASSERT(mPendingEDIDRequests.contains(outputId));
+    const ConfigPtr config = watcher->property("config").value<KScreen::ConfigPtr>();
+    Q_ASSERT(mPendingEDIDRequests.contains(config));
+    Q_ASSERT(mPendingEDIDRequests[config].contains(outputId));
 
     watcher->deleteLater();
 
-    mPendingEDIDRequests.remove(watcher->property("outputId").toInt());
+    mPendingEDIDRequests[config].removeOne(outputId);
 
     const QDBusPendingReply<QByteArray> reply = *watcher;
     if (reply.isError()) {
         qCWarning(KSCREEN) << "Error when retrieving EDID: " << reply.error().message();
-        if (mPendingEDIDRequests.isEmpty()) {
-            updateConfigs(mPendingConfigUpdate);
+    } else {
+        const QByteArray edid = reply.argumentAt<0>();
+        if (!edid.isEmpty()) {
+            OutputPtr output = config->output(outputId);
+            output->setEdid(edid);
         }
-        return;
-    }
-
-    const QByteArray edid = reply.argumentAt<0>();
-    if (!edid.isEmpty()) {
-        OutputPtr output = mPendingConfigUpdate->output(outputId);
-        output->setEdid(edid);
     }
 
-    if (mPendingEDIDRequests.isEmpty()) {
-        const KScreen::ConfigPtr config = mPendingConfigUpdate;
-        mPendingConfigUpdate.clear();
+    if (mPendingEDIDRequests[config].isEmpty()) {
+        mPendingEDIDRequests.remove(config);
         updateConfigs(config);
     }
 }
-- 
2.2.2

Places

File 0001-Fix-crash-when-multiple-EDID-requests-for-the-same-o.patch of Package libkscreen2 (Revision 7041154290aaaa04a8493fcf09ecebbd)

Places