summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2018-09-14 09:11:09 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2018-09-14 15:17:03 +0200
commit79dfbd20de1636e60fb6b8b1a08d0784a4188715 (patch)
treef498b31315f0d5c2b44d00ed51ad1ca7f7c474a8
parent634d30ce48d89c23ef8cc07ed66c05dc00e19b49 (diff)
kde5backend.cxx: Fix inverted logic leading to invalid write
Only write to 'pFakeArgv[2]' when 'aDisplay' is NON-empty. Otherwise, the 'pFakeArgv' array only has size 2 and the write is invalid. (Found by valgrind while looking at another issue.) Change-Id: I58aff6d25c8647bc6ef346af8ac09b0b0fc030b8 Reviewed-on: https://gerrit.libreoffice.org/60476 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 2fdafe62ef3959ec34e05daf312088a8f0534d9a) Reviewed-on: https://gerrit.libreoffice.org/60485 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r--shell/source/backends/kde5be/kde5backend.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/source/backends/kde5be/kde5backend.cxx b/shell/source/backends/kde5be/kde5backend.cxx
index 0c0472b0233a..e2f6e25c0764 100644
--- a/shell/source/backends/kde5be/kde5backend.cxx
+++ b/shell/source/backends/kde5be/kde5backend.cxx
@@ -159,7 +159,7 @@ void initQApp()
pFakeArgv[0] = strdup(getExecutable().getStr());
pFakeArgv[1] = strdup("--nocrashhandler");
- if (aDisplay.isEmpty())
+ if (!aDisplay.isEmpty())
pFakeArgv[2] = strdup(aDisplay.getStr());
char* session_manager = nullptr;