From d25ffcfbfcfe8e059f2889873c9dbe76a28ad00c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 5 Jun 2008 15:29:35 +0930 Subject: [PATCH] mi: protect against possible NULL-pointer dereference. --- mi/misprite.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mi/misprite.c b/mi/misprite.c index 25f6b6f8c..b8df5eb54 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -460,7 +460,7 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout, pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); SCREEN_PROLOGUE(pScreen, BlockHandler); - + (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); SCREEN_EPILOGUE(pScreen, BlockHandler); @@ -470,8 +470,8 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout, if (DevHasCursor(pDev)) { pCursorInfo = MISPRITE(pDev); - if (!pCursorInfo->isUp - && pCursorInfo->pScreen == pScreen + if (pCursorInfo && !pCursorInfo->isUp + && pCursorInfo->pScreen == pScreen && pCursorInfo->shouldBeUp) { SPRITE_DEBUG (("BlockHandler restore\n")); @@ -484,8 +484,8 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout, if (DevHasCursor(pDev)) { pCursorInfo = MISPRITE(pDev); - if (!pCursorInfo->isUp && - pCursorInfo->pScreen == pScreen && + if (pCursorInfo && !pCursorInfo->isUp && + pCursorInfo->pScreen == pScreen && pCursorInfo->shouldBeUp) { SPRITE_DEBUG (("BlockHandler restore\n"));