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

Xext: only update the sprite on pointer events. 

A call to miPointerUpdateSprite for the XTEST keyboard may result in a
NULL pointer dereference in miDCPutUpCursor() when the save buffer is NULL.

XTS test case: Xlib 11 KeymapNotify

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2010-04-21 15:51:20 +10:00
parent bac1c5f1be
commit af170a4ab7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Xext/xtest.c
View File

@ -184,6 +184,7 @@ ProcXTestFakeInput(ClientPtr client)
int i; int i;
int base = 0; int base = 0;
int flags = 0; int flags = 0;
int need_ptr_update = 1;
nev = (stuff->length << 2) - sizeof(xReq); nev = (stuff->length << 2) - sizeof(xReq);
if ((nev % sizeof(xEvent)) || !nev) if ((nev % sizeof(xEvent)) || !nev)
@ -388,6 +389,8 @@ ProcXTestFakeInput(ClientPtr client)
client->errorValue = ev->u.u.detail; client->errorValue = ev->u.u.detail;
return BadValue; return BadValue;
} }
need_ptr_update = 0;
break; break;
case MotionNotify: case MotionNotify:
if (!dev->valuator) if (!dev->valuator)
@ -452,6 +455,7 @@ ProcXTestFakeInput(ClientPtr client)
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqProcessDeviceEvent(dev, (InternalEvent*)(xtest_evlist+i)->event, NULL); mieqProcessDeviceEvent(dev, (InternalEvent*)(xtest_evlist+i)->event, NULL);
if (need_ptr_update)
miPointerUpdateSprite(dev); miPointerUpdateSprite(dev);
return client->noClientException; return client->noClientException;
} }