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

mi: protect against NULL-pointer dereference. 

Required by the recent patch to use a NullCursor instead of UndisplayCursor().
This commit is contained in:
Peter Hutterer 2008-05-14 09:42:50 +09:30
parent dc3aba8a55
commit a6659291c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mi/mipointer.c
View File

@ -357,7 +357,7 @@ miPointerWarpCursor (pDev, pScreen, x, y)
{ {
pPointer->devx = x; pPointer->devx = x;
pPointer->devy = y; pPointer->devy = y;
if(!pPointer->pCursor->bits->emptyMask) if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask)
(*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y); (*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);
} }
pPointer->x = x; pPointer->x = x;
@ -541,7 +541,7 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
{ {
pPointer->devx = x; pPointer->devx = x;
pPointer->devy = y; pPointer->devy = y;
if(!pPointer->pCursor->bits->emptyMask) if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask)
(*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y); (*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);
} }