frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on XkbSetMap 

Some devices may not have keyboard information.

Fixes #574

(cherry picked from commit 8469bfead9)
This commit is contained in:
Samuel Thibault 2019-07-01 02:31:02 +02:00 committed by Peter Hutterer
parent 616b3e1dd1
commit b6ee04e774
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkb/xkb.c
View File

@ -2386,6 +2386,9 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req,
XkbSymMapPtr map; XkbSymMapPtr map;
int i; int i;
if (!dev->key)
return 0;
xkbi = dev->key->xkbInfo; xkbi = dev->key->xkbInfo;
xkb = xkbi->desc; xkb = xkbi->desc;
@ -2498,6 +2501,9 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values)
XkbSrvInfoPtr xkbi; XkbSrvInfoPtr xkbi;
XkbDescPtr xkb; XkbDescPtr xkb;
if (!dev->key)
return Success;
xkbi = dev->key->xkbInfo; xkbi = dev->key->xkbInfo;
xkb = xkbi->desc; xkb = xkbi->desc;