summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2016-11-02 13:25:33 -0700
committerKeith Packard <keithp@keithp.com>2016-11-15 08:05:15 -0800
commitea8efb3a997e15d27d362762e6c85d59487f9864 (patch)
treec1b25b5a3c0b7f895ea42e3a715e64a55095157c /include
parent7513da40a656317ad3aa101651d29373de99c798 (diff)
dix: Make sure client is not in output_pending chain after closed (RH 1382444)
I think it is possible that output could get queued to a client during CloseDownClient. After it is removed from the pending queue, active grabs are released, the client is awoken if sleeping and any work queue entries related to the client are processed. To fix this, move the call removing it from the output_pending chain until after clientGone has been set and then check clientGone in output_pending_mark. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444 Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/dixstruct.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 3b578f81a..d71b0ac05 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -159,7 +159,7 @@ extern struct xorg_list output_pending_clients;
static inline void
output_pending_mark(ClientPtr client)
{
- if (xorg_list_is_empty(&client->output_pending))
+ if (!client->clientGone && xorg_list_is_empty(&client->output_pending))
xorg_list_append(&client->output_pending, &output_pending_clients);
}