File Fix-possible-crash-when-using-KDM.patch of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File Fix-possible-crash-when-using-KDM.patch of Package plasma5-workspace (Revision 5c1b0e295218abb0d69626749cf7139a)

Currently displaying revision 5c1b0e295218abb0d69626749cf7139a , Show latest

From 3bf4df333562a5d1c416c90043339560bce4b9cf Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Fri, 4 Sep 2020 10:48:01 +0000
Subject: [PATCH] Fix possible crash when using KDM

Commit 19c06e72937d355ef73cd74b8df126f875822f3a removed setting dpy, but it is still used
in the NewKDM and OldKDM code branches.

So set it again, and add a check that it's not empty where relevant.
---
 libkworkspace/kdisplaymanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libkworkspace/kdisplaymanager.cpp b/libkworkspace/kdisplaymanager.cpp
index 9d360ec6e..dbe00f442 100644
--- a/libkworkspace/kdisplaymanager.cpp
+++ b/libkworkspace/kdisplaymanager.cpp
@@ -303,9 +303,10 @@ KDisplayManager::KDisplayManager() : d(new Private)
     qDBusRegisterMetaType<NumberedDBusObjectPath>();
 
     if (DMType == Dunno) {
-        if ((ctl = ::getenv("DM_CONTROL")))
+        dpy = ::getenv("DISPLAY");
+        if (dpy && (ctl = ::getenv("DM_CONTROL")))
             DMType = NewKDM;
-        else if ((ctl = ::getenv("XDM_MANAGED")) && ctl[0] == '/')
+        else if (dpy && (ctl = ::getenv("XDM_MANAGED")) && ctl[0] == '/')
             DMType = OldKDM;
         else if (::getenv("XDG_SEAT_PATH") && LightDMDBus().isValid())
             DMType = LightDM;
-- 
GitLab

Places

File Fix-possible-crash-when-using-KDM.patch of Package plasma5-workspace (Revision 5c1b0e295218abb0d69626749cf7139a)

Places