[X2Go-Commits] [nx-libs] 78/108: Check nxagentXkbInfo.EventBase before use

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 2db519141865cd504351aabf042db5bdf2ac5d96
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sun Jun 24 23:33:33 2018 +0200

    Check nxagentXkbInfo.EventBase before use
---
 nx-X11/programs/Xserver/hw/nxagent/Events.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 94480c4..4c85145 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -2782,7 +2782,8 @@ int nxagentHandleXkbKeyboardStateEvent(XEvent *X)
 {
   XkbEvent *xkbev = (XkbEvent *) X;
 
-  if (xkbev -> type == nxagentXkbInfo.EventBase + XkbEventCode &&
+  if (nxagentXkbInfo.EventBase != -1 &&
+      xkbev -> type == nxagentXkbInfo.EventBase + XkbEventCode &&
           xkbev -> any.xkb_type == XkbStateNotify)
   {
     #ifdef TEST
@@ -3815,6 +3816,11 @@ int nxagentInitXkbKeyboardState(void)
 
   XkbEvent *xkbev = (XkbEvent *) &X;
 
+  if (nxagentXkbInfo.EventBase == -1)
+  {
+      return 1;
+  }
+
   #ifdef TEST
   fprintf(stderr, "%s: Initializing XKB state.\n", __func__);
   #endif

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git