summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-08-20 10:52:52 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-24 10:06:40 +1000
commit65354e5a698a5b527db09afc431110afba0e14b2 (patch)
tree27b7186e9c48f7b50f8d3fa92082163ebc2cc983
parentef75301854d41c6b11dd2742fa9d17a5de8a4cfa (diff)
Xi: return BadDevice for changing device cursors on non-master pointers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Xi/xichangecursor.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index dc33d70a1..ea5bdeb93 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -78,6 +78,9 @@ int ProcXIChangeCursor(ClientPtr client)
if (rc != Success)
return rc;
+ if (!IsMaster(pDev) || !IsPointerDevice(pDev))
+ return BadDevice;
+
if (stuff->win != None)
{
rc = dixLookupWindow(&pWin, stuff->win, client, DixSetAttrAccess);