From d2ebbcdaf6b13d70eee704b1764ff349e1be22a0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 29 Nov 2011 16:15:37 +1000 Subject: [PATCH] Xi: when removing a device, reset ClientPointers where needed if a client had the to-be-removed device as ClientPointer, reset to NULL. Fixes #43165 Signed-off-by: Peter Hutterer Reviewed-by: Jeremy Huddleston --- Xi/xichangehierarchy.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 614d23116..a8bc761d3 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -200,6 +200,19 @@ unwind: return rc; } +static int +disable_clientpointer(DeviceIntPtr dev) +{ + int i; + + for (i = 0; i < currentMaxClients; i++) + { + ClientPtr client = clients[i]; + if (client && client->clientPtr == dev) + client->clientPtr = NULL; + } +} + static int remove_master(ClientPtr client, xXIRemoveMasterInfo *r, int flags[MAXDEVICES]) @@ -250,6 +263,8 @@ remove_master(ClientPtr client, xXIRemoveMasterInfo *r, if (rc != Success) goto unwind; + disable_clientpointer(ptr); + /* Disabling sends the devices floating, reattach them if * desired. */ if (r->return_mode == XIAttachToMaster)