diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2019-10-10 11:23:55 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2019-10-10 11:23:55 +0200 |
| commit | 994305ff43e7165d0aca8510263a969ac2fb1327 (patch) | |
| tree | f10f5548b9f08f0ec8bba628d236e78bd5960d2c | |
| parent | 5405447e5a0ec582a474a0e506265475bd4fd5a8 (diff) | |
| parent | dc7a78b4553cda0e18b9083fb362bf9301660e01 (diff) | |
| download | nx-libs-994305ff43e7165d0aca8510263a969ac2fb1327.tar.gz nx-libs-994305ff43e7165d0aca8510263a969ac2fb1327.tar.bz2 nx-libs-994305ff43e7165d0aca8510263a969ac2fb1327.zip | |
Merge branch 'uli42-pr/fix_segfault' into 3.6.x
Attributes GH PR #848: https://github.com/ArcticaProject/nx-libs/pull/848
Fixes: ArcticaProject/nx-libs#847
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 2d998980c..abdb650a4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -1103,6 +1103,9 @@ static void nxagentParseSingleOption(char *name, char *value) URLDecodeInPlace(value); + if (!value) + value = ""; + if (!strcmp(name, "kbtype") || !strcmp(name, "keyboard") || !strcmp(name, "id") || |