dix: free the unused device classes when closing a device.

This also requires to NULL-ify all pointers while we're actually using them,
otherwise we'd try to free them twice.

1 files changed, 7 insertions, 0 deletions

diff --git a/dix/devices.c b/dix/devices.c
index d4459168f..fe70e7870 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -775,6 +775,13 @@ CloseDevice(DeviceIntPtr dev)
     classes = (ClassesPtr)&dev->key;
     FreeAllDeviceClasses(classes);
 
+    if (dev->isMaster)
+    {
+        classes = dixLookupPrivate(&dev->devPrivates, UnusedClassesPrivateKey);
+        FreeAllDeviceClasses(classes);
+    }
+
+
 #ifdef XKB
     while (dev->xkb_interest)
 	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);