frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
(cherry picked from commit 578371616e)
This commit is contained in:
Daniel Llewellyn 2020-02-06 17:56:12 +01:00 committed by Michel Dänzer
parent e5293f1c5d
commit af2fd88b10
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
os/io.c
View File

@ -557,6 +557,11 @@ void
ResetCurrentRequest(ClientPtr client) ResetCurrentRequest(ClientPtr client)
{ {
OsCommPtr oc = (OsCommPtr) client->osPrivate; OsCommPtr oc = (OsCommPtr) client->osPrivate;
/* ignore dying clients */
if (!oc)
return;
register ConnectionInputPtr oci = oc->input; register ConnectionInputPtr oci = oc->input;
register xReq *request; register xReq *request;
int gotnow, needed; int gotnow, needed;