aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-05-21 10:57:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-05-21 10:57:22 +0200
commit789d3a37e656167a63e637140805fac145c765ea (patch)
treed965b27ce852bd7262c26459815d457f6bf5a2bf /nx-X11/programs
parent6981e9bb0cd51d22b06dd4241a55f6e08f60e75d (diff)
parent20353e96a390a029f7b3b18fc7ddd82eae98b935 (diff)
downloadnx-libs-789d3a37e656167a63e637140805fac145c765ea.tar.gz
nx-libs-789d3a37e656167a63e637140805fac145c765ea.tar.bz2
nx-libs-789d3a37e656167a63e637140805fac145c765ea.zip
Merge branch 'uli42-pr/fix_xkb_crash' into 3.6.x
Attributes GH PR #809: https://github.com/ArcticaProject/nx-libs/pull/809
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/xkb/xkbUtils.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c
index 028f32454..21a5ce76a 100644
--- a/nx-X11/programs/Xserver/xkb/xkbUtils.c
+++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c
@@ -685,6 +685,10 @@ unsigned act;
else group= newGroup;
}
else {
+#ifdef NXAGENT_SERVER
+ /* we have seen division by zero here */
+ if (ctrls->num_groups != 0)
+#endif
group%= ctrls->num_groups;
}
}