diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-15 11:25:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-15 11:25:17 +0200 |
| commit | 2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (patch) | |
| tree | 7001b0332aba46855f1d01d7ef8ed80d134453a9 /xorg-server/xkb/xkb.c | |
| parent | d03a5f20114203fd00e0004659fd2617f4c03a32 (diff) | |
| download | vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.gz vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.bz2 vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.zip | |
xserver libX11 mesa git update 15 July
Diffstat (limited to 'xorg-server/xkb/xkb.c')
| -rw-r--r-- | xorg-server/xkb/xkb.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index 86231a895..9c66955f4 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -2786,6 +2786,7 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev, if (req->nSI>0) { xkbSymInterpretWireDesc *wire = (xkbSymInterpretWireDesc *)data; XkbSymInterpretPtr sym; + unsigned int skipped = 0; if ((unsigned)(req->firstSI+req->nSI)>compat->num_si) { compat->num_si= req->firstSI+req->nSI; compat->sym_interpret= realloc(compat->sym_interpret, @@ -2799,11 +2800,19 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev, compat->num_si = req->firstSI+req->nSI; } sym = &compat->sym_interpret[req->firstSI]; - for (i=0;i<req->nSI;i++,wire++,sym++) { + for (i=0;i<req->nSI;i++,wire++) { if (client->swapped) { int n; swapl(&wire->sym,n); } + if (wire->sym == NoSymbol && wire->match == XkbSI_AnyOfOrNone && + (wire->mods & 0xff) == 0xff && + wire->act.type == XkbSA_XFree86Private) { + ErrorF("XKB: Skipping broken Any+AnyOfOrNone(All) -> Private " + "action from client\n"); + skipped++; + continue; + } sym->sym= wire->sym; sym->mods= wire->mods; sym->match= wire->match; @@ -2811,6 +2820,14 @@ _XkbSetCompatMap(ClientPtr client, DeviceIntPtr dev, sym->virtual_mod= wire->virtualMod; memcpy((char *)&sym->act,(char *)&wire->act, SIZEOF(xkbActionWireDesc)); + sym++; + } + if (skipped) { + if (req->firstSI + req->nSI < compat->num_si) + memmove(sym, sym + skipped, + (compat->num_si - req->firstSI - req->nSI) * + sizeof(*sym)); + compat->num_si -= skipped; } data = (char *)wire; } |