[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/KDE/4.11] kdm/backend: Fix crash when DesktopNames isn't set
From:       David Faure <faure () kde ! org>
Date:       2014-05-02 8:28:24
Message-ID: E1Wg8pU-0007Vo-0C () scm ! kde ! org
[Download RAW message or body]

Git commit e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f by David Faure.
Committed on 02/05/2014 at 08:26.
Pushed by dfaure into branch 'KDE/4.11'.

Fix crash when DesktopNames isn't set

BUG: 334159
FIXED-IN: 4.11.10

M  +7    -5    kdm/backend/client.c

http://commits.kde.org/kde-workspace/e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f

diff --git a/kdm/backend/client.c b/kdm/backend/client.c
index 335cc3e..a2d06c2 100644
--- a/kdm/backend/client.c
+++ b/kdm/backend/client.c
@@ -1810,12 +1810,14 @@ startClient(volatile int *pid)
                             !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
                         sessargs = "";
                     buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
-                    for (buf2 = buf; *buf2; ++buf2) {
-                        if (*buf2 == ';')
-                            *buf2 = ':';
+                    if (buf) {
+                        for (buf2 = buf; *buf2; ++buf2) {
+                            if (*buf2 == ';')
+                                *buf2 = ':';
+                        }
+                        userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
+                        free(buf);
                     }
-                    userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
-                    free(buf);
                     free(str);
                     free(fname);
                     goto gotit;
[prev in list] [next in list] [prev in thread] [next in thread]