summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorDaniel Llewellyn <daniel@bowlhat.net>2020-01-29 21:33:24 +0000
committerDaniel Llewellyn <daniel@bowlhat.net>2020-01-29 21:39:53 +0000
commit578371616e09364318c9fb2371a693d438b31b29 (patch)
treeda6f3736134e1244d44c523b14bfcea8e989bd9e /os
parentb6a5389e1789d63c6c61983b973b8559953afc88 (diff)
os: Ignore dying client in ResetCurrentRequest
You might as well, it's harmless. Better, some cleanup code (like DRI2 swap wait) needs to run both normally and at client exit, so it simplifies the callers to not need to check first. See 4308f5d3 for a similar example. Props: @ajax (Adam Jackson) Fixes: xorg/xserver#211 Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
Diffstat (limited to 'os')
-rw-r--r--os/io.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/os/io.c b/os/io.c
index b099f0967..939f51743 100644
--- a/os/io.c
+++ b/os/io.c
@@ -557,6 +557,11 @@ void
ResetCurrentRequest(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
+
+ /* ignore dying clients */
+ if (!oc)
+ return;
+
register ConnectionInputPtr oci = oc->input;
register xReq *request;
int gotnow, needed;