Skip to content

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

Keyboard.c: guard XkbFreeKeyboard calls

manpage does not tell us if NULL is valid
parent 1b05251a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
View file @ d8bbbcf2
...@@ -723,8 +723,11 @@ XkbError: ...@@ -723,8 +723,11 @@ XkbError:
fprintf(stderr, "nxagentKeyboardProc: XKB error.\n"); fprintf(stderr, "nxagentKeyboardProc: XKB error.\n");
#endif #endif
XkbFreeKeyboard(xkb, XkbAllComponentsMask, True); if (xkb)
xkb = NULL; {
XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
xkb = NULL;
}
free(model); free(model);
free(layout); free(layout);
...@@ -874,14 +877,16 @@ XkbError: ...@@ -874,14 +877,16 @@ XkbError:
goto XkbError; goto XkbError;
} }
XkbEnd:
if (nxagentOption(Shadow) == 1 && pDev && pDev->key) if (nxagentOption(Shadow) == 1 && pDev && pDev->key)
{ {
NXShadowInitKeymap(&(pDev->key->curKeySyms)); NXShadowInitKeymap(&(pDev->key->curKeySyms));
} }
XkbFreeKeyboard(xkb, XkbAllComponentsMask, True); if (xkb)
xkb = NULL; {
XkbFreeKeyboard(xkb, XkbAllComponentsMask, True);
xkb = NULL;
}
free(model); free(model);
free(layout); free(layout);
......
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