Remove references to other devices after shutdown.

deviceArray keeps a ref to each InputInfoPtr this driver (on this device)
handles. These need to be unset and removed, otherwise an event coming in
after the shutdown of one device may dereference an invalid pointer.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 15 insertions, 3 deletions

diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index d41f890..a68814f 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1785,9 +1785,21 @@ xf86AiptekUninit(InputDriverPtr    drv,
     {
         if (device->common)
         {
-            device->common->numDevices--;
-            if (device->common->numDevices == 0)
-                free(device->common);
+            AiptekCommonPtr common = device->common;
+            int i;
+
+            common->numDevices--;
+
+            for (i = 0; i < common->numDevices; i++)
+            {
+                if (common->deviceArray[i] == pInfo)
+                    memmove(&common->deviceArray[i],
+                            &common->deviceArray[i+1],
+                            (common->numDevices - i) * sizeof(InputInfoPtr));
+            }
+
+            if (common->numDevices == 0)
+                free(common);
         }
         device->common = NULL;
     }