From 1fab51edfc82e1ef60dfa29fd5d93478066a3998 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon, 28 Apr 2008 11:37:21 +0930
Subject: [PATCH] mi: guard against NULL-pointer dereference.

---
 mi/misprite.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mi/misprite.c b/mi/misprite.c
index c998e556a..9e4b6851e 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -916,12 +916,15 @@ miSpriteUndisplayCursor(pDev, pScreen)
     DeviceIntPtr pDev;
     ScreenPtr    pScreen;
 {
+    miCursorInfoPtr pCursorInfo;
+
     if (!pDev->isMaster && !pDev->u.master)
     {
         ErrorF("[mi] miSpriteUndisplayCursor called for floating device.\n");
         return;
     }
-    if (MISPRITE(pDev)->isUp)
+    pCursorInfo = MISPRITE(pDev);
+    if (pCursorInfo && pCursorInfo->isUp)
         miSpriteRemoveCursor(pDev, pScreen);
 }