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

make DIX more tolerant of devices without a CtrlProc (Debian #269860) 

Return BadDevice on client requests for devices without a CtrlProc, instead
of tanking horribly.
This commit is contained in:
Daniel Stone 2006-08-12 21:50:39 +03:00 committed by Daniel Stone
parent 59dcc62906
commit 2bf9e3dc1e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dix/devices.c
View File

@ -1454,6 +1454,10 @@ ProcChangeKeyboardControl (ClientPtr client)
REQUEST(xChangeKeyboardControlReq); REQUEST(xChangeKeyboardControlReq);
REQUEST_AT_LEAST_SIZE(xChangeKeyboardControlReq); REQUEST_AT_LEAST_SIZE(xChangeKeyboardControlReq);
if (!keybd->kbdfeed->CtrlProc)
return BadDevice;
vmask = stuff->mask; vmask = stuff->mask;
if (client->req_len != (sizeof(xChangeKeyboardControlReq)>>2)+Ones(vmask)) if (client->req_len != (sizeof(xChangeKeyboardControlReq)>>2)+Ones(vmask))
return BadLength; return BadLength;
@ -1660,6 +1664,10 @@ ProcBell(ClientPtr client)
int newpercent; int newpercent;
REQUEST(xBellReq); REQUEST(xBellReq);
REQUEST_SIZE_MATCH(xBellReq); REQUEST_SIZE_MATCH(xBellReq);
if (!keybd->kbdfeed->BellProc)
return BadDevice;
if (stuff->percent < -100 || stuff->percent > 100) if (stuff->percent < -100 || stuff->percent > 100)
{ {
client->errorValue = stuff->percent; client->errorValue = stuff->percent;
@ -1677,7 +1685,7 @@ ProcBell(ClientPtr client)
else else
#endif #endif
(*keybd->kbdfeed->BellProc)(newpercent, keybd, (*keybd->kbdfeed->BellProc)(newpercent, keybd,
(pointer) &keybd->kbdfeed->ctrl, 0); (pointer) &keybd->kbdfeed->ctrl, 0);
return Success; return Success;
} }
@ -1689,6 +1697,10 @@ ProcChangePointerControl(ClientPtr client)
REQUEST(xChangePointerControlReq); REQUEST(xChangePointerControlReq);
REQUEST_SIZE_MATCH(xChangePointerControlReq); REQUEST_SIZE_MATCH(xChangePointerControlReq);
if (!mouse->ptrfeed->CtrlProc)
return BadDevice;
ctrl = mouse->ptrfeed->ctrl; ctrl = mouse->ptrfeed->ctrl;
if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse))
{ {