From a6659291c798f417a76d9aa7944694ff27c01fa7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 14 May 2008 09:42:50 +0930 Subject: [PATCH] mi: protect against NULL-pointer dereference. Required by the recent patch to use a NullCursor instead of UndisplayCursor(). --- mi/mipointer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mi/mipointer.c b/mi/mipointer.c index 82439474c..2c226dc71 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -357,7 +357,7 @@ miPointerWarpCursor (pDev, pScreen, x, y) { pPointer->devx = x; pPointer->devy = y; - if(!pPointer->pCursor->bits->emptyMask) + if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask) (*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y); } pPointer->x = x; @@ -541,7 +541,7 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y, { pPointer->devx = x; pPointer->devy = y; - if(!pPointer->pCursor->bits->emptyMask) + if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask) (*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y); }