mi: guard against NULL-pointer dereference.

This commit is contained in:
Peter Hutterer 2008-04-28 11:37:21 +09:30
parent b5004722a2
commit 1fab51edfc

View File

@ -916,12 +916,15 @@ miSpriteUndisplayCursor(pDev, pScreen)
DeviceIntPtr pDev; DeviceIntPtr pDev;
ScreenPtr pScreen; ScreenPtr pScreen;
{ {
miCursorInfoPtr pCursorInfo;
if (!pDev->isMaster && !pDev->u.master) if (!pDev->isMaster && !pDev->u.master)
{ {
ErrorF("[mi] miSpriteUndisplayCursor called for floating device.\n"); ErrorF("[mi] miSpriteUndisplayCursor called for floating device.\n");
return; return;
} }
if (MISPRITE(pDev)->isUp) pCursorInfo = MISPRITE(pDev);
if (pCursorInfo && pCursorInfo->isUp)
miSpriteRemoveCursor(pDev, pScreen); miSpriteRemoveCursor(pDev, pScreen);
} }