From 22a3ffe68c9c498e0b6b74ebcf1404becda8e2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Mon, 26 Feb 2018 17:30:57 +0100 Subject: [PATCH] glx: Don't pass NULL to glxGetClient MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Adam Jackson --- glx/glxext.c | 4 ++-- 1 file 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]); }