Skip to content

N
nx-libs
Commit 2db51914 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Check nxagentXkbInfo.EventBase before use

parent 122db3fd
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
nx-X11/programs/Xserver/hw/nxagent/Events.c
View file @ 2db51914
...@@ -2782,7 +2782,8 @@ int nxagentHandleXkbKeyboardStateEvent(XEvent *X) ...@@ -2782,7 +2782,8 @@ int nxagentHandleXkbKeyboardStateEvent(XEvent *X)
{ {
XkbEvent *xkbev = (XkbEvent *) 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) xkbev -> any.xkb_type == XkbStateNotify)
{ {
#ifdef TEST #ifdef TEST
...@@ -3815,6 +3816,11 @@ int nxagentInitXkbKeyboardState(void) ...@@ -3815,6 +3816,11 @@ int nxagentInitXkbKeyboardState(void)
XkbEvent *xkbev = (XkbEvent *) &X; XkbEvent *xkbev = (XkbEvent *) &X;
if (nxagentXkbInfo.EventBase == -1)
{
return 1;
}
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: Initializing XKB state.\n", __func__); fprintf(stderr, "%s: Initializing XKB state.\n", __func__);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment