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

mi: protect against possible NULL-pointer dereference.

This commit is contained in:
Peter Hutterer 2008-06-05 15:29:35 +09:30
parent 874dcdb3bd
commit d25ffcfbfc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mi/misprite.c
View File

@ -460,7 +460,7 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout,
pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
SCREEN_PROLOGUE(pScreen, BlockHandler); SCREEN_PROLOGUE(pScreen, BlockHandler);
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
SCREEN_EPILOGUE(pScreen, BlockHandler); SCREEN_EPILOGUE(pScreen, BlockHandler);
@ -470,8 +470,8 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout,
if (DevHasCursor(pDev)) if (DevHasCursor(pDev))
{ {
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
if (!pCursorInfo->isUp if (pCursorInfo && !pCursorInfo->isUp
&& pCursorInfo->pScreen == pScreen && pCursorInfo->pScreen == pScreen
&& pCursorInfo->shouldBeUp) && pCursorInfo->shouldBeUp)
{ {
SPRITE_DEBUG (("BlockHandler restore\n")); SPRITE_DEBUG (("BlockHandler restore\n"));
@ -484,8 +484,8 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout,
if (DevHasCursor(pDev)) if (DevHasCursor(pDev))
{ {
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
if (!pCursorInfo->isUp && if (pCursorInfo && !pCursorInfo->isUp &&
pCursorInfo->pScreen == pScreen && pCursorInfo->pScreen == pScreen &&
pCursorInfo->shouldBeUp) pCursorInfo->shouldBeUp)
{ {
SPRITE_DEBUG (("BlockHandler restore\n")); SPRITE_DEBUG (("BlockHandler restore\n"));