summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2018-09-14 09:11:09 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-09-14 13:20:29 +0200
commit19759611473383003773d55c104ae6c7f3d0230b (patch)
tree243de0027c607c65c83536602aab6682a1d8c85d
parent62f899619a680d729bdc4f1d8426a00107aa2c4c (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/60486 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.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 57f955cec1ad..9f9fb6f5c23b 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;