summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2018-02-26 17:30:57 +0100
committerAdam Jackson <ajax@redhat.com>2018-02-26 12:28:55 -0500
commit22a3ffe68c9c498e0b6b74ebcf1404becda8e2b1 (patch)
treef8a125489772a97eee96b161f4509bc56ad5d2de
parent528c94c6501db936882cd06338e2250a0b884b36 (diff)
glx: Don't pass NULL to glxGetClient
These guards were dropped by the commit below, but it turns out they're needed. Fixes crash on VT switch. Fixes: d8ec33fe0542 ("glx: Use vnd layer for dispatch (v4)") Bugzilla: https://bugs.freedesktop.org/105233 Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--glx/glxext.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/glx/glxext.c b/glx/glxext.c
index 37416a4e4..f1355ce31 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -652,7 +652,7 @@ glxSuspendClients(void)
int i;
for (i = 1; i < currentMaxClients; i++) {
- if (glxGetClient(clients[i])->client)
+ if (clients[i] && glxGetClient(clients[i])->client)
IgnoreClient(clients[i]);
}
@@ -668,7 +668,7 @@ glxResumeClients(void)
glxBlockClients = FALSE;
for (i = 1; i < currentMaxClients; i++) {
- if (glxGetClient(clients[i])->client)
+ if (clients[i] && glxGetClient(clients[i])->client)
AttendClient(clients[i]);
}