1 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 9c9ca5496..ff5af9379 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -87,6 +87,10 @@ SOFTWARE.
 #include "xserver-properties.h"
 #include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */
 
+#ifdef _MSC_VER
+#define isfinite(val) _finite(val)
+#endif
+
 /** @file
  * This file handles input device-related stuff.
  */
@@ -987,6 +991,10 @@ CloseDownDevices(void)
     {
         if (!IsMaster(dev) && dev->u.master)
             dev->u.master = NULL;
+        /* Initialise the sprite and paired members of all devices
+           to avoid crashes in CloseDevice later */
+        dev->spriteInfo->sprite=NULL;
+        dev->spriteInfo->paired=NULL;
     }
 
     CloseDeviceList(&inputInfo.devices);