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

Xi: sanitize ProcXIGetClientPointer. 

This was quite old code and can be streamlined a bit. The new code is
essentially the same as in ProcXISetClientPointer.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-06-12 10:54:55 +10:00
parent 96ea82fdac
commit 98e8ec8deb
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Xi/getcptr.c
View File

@ -59,22 +59,21 @@ SProcXIGetClientPointer(ClientPtr client)
int ProcXIGetClientPointer(ClientPtr client) int ProcXIGetClientPointer(ClientPtr client)
{ {
int err; int rc;
WindowPtr win;
ClientPtr winclient; ClientPtr winclient;
xXIGetClientPointerReply rep; xXIGetClientPointerReply rep;
REQUEST(xXIGetClientPointerReq); REQUEST(xXIGetClientPointerReq);
REQUEST_SIZE_MATCH(xXIGetClientPointerReq); REQUEST_SIZE_MATCH(xXIGetClientPointerReq);
err = dixLookupWindow(&win, stuff->win, client, DixReadAccess); if (stuff->win != None)
if (err != Success)
{ {
SendErrorToClient(client, IReqCode, X_XIGetClientPointer, rc = dixLookupClient(&winclient, stuff->win, client,
stuff->win, err); DixWriteAccess);
return Success;
}
winclient = wClient(win); if (rc != Success)
return BadWindow;
} else
winclient = client;
rep.repType = X_Reply; rep.repType = X_Reply;
rep.RepType = X_XIGetClientPointer; rep.RepType = X_XIGetClientPointer;