diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-21 21:22:47 +0000 |
| commit | e141b55eccf3c69d8ced513992e21463d37dbb03 (patch) | |
| tree | eaeeeda04d5b6ce82d43d04466164b44a74d0951 /xorg-server/dix/devices.c | |
| parent | d0fe50e45b3a640afa51eb8f45cf7c3a0df0740b (diff) | |
| parent | 1f876171067c04fc21fccd5a3051f982fd85c0f0 (diff) | |
| download | vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.gz vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.tar.bz2 vcxsrv-e141b55eccf3c69d8ced513992e21463d37dbb03.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index e86e606c0..6a7907399 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -2221,12 +2221,15 @@ ProcQueryKeymap(ClientPtr client) rep.length = 2; rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess); - if (rc != Success) + if (rc != Success && rc != BadAccess) return rc; for (i = 0; i<32; i++) rep.map[i] = down[i]; + if (rc == BadAccess) + memset(rep.map, 0, 32); + WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep); return Success; |