From b46a00918691cbd5ca80b6d3acae7614f93e073b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sun, 6 Apr 2008 09:02:57 +0930
Subject: [PATCH] dix: sprite may be NULL, don't dereference it then.

In some rare cases (e.g. when the init fails) a device's sprite is NULL,
dereferencing it to xfree the spriteTrace is a bad idea then.
---
 dix/devices.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/devices.c b/dix/devices.c
index 61b3b66af..c4cde2660 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -873,7 +873,7 @@ CloseDevice(DeviceIntPtr dev)
 	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
 #endif
 
-    if (DevHasCursor(dev)) {
+    if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
         xfree(dev->spriteInfo->sprite->spriteTrace);
         xfree(dev->spriteInfo->sprite);
     }