From 8e000cecac35c2d7da953ff2523e5d40ab815a84 Mon Sep 17 00:00:00 2001
From: stefan11111 <stefan11111@shitposting.expert>
Date: Fri, 12 Sep 2025 22:54:30 +0300
Subject: [PATCH] glx: Fix segfault when Nvidia PRIME render offload is
 enabled, but not used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11719

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37342>
---
 src/glx/clientinfo.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/glx/clientinfo.c b/src/glx/clientinfo.c
index ebd4545ad11..14e0e44a832 100644
--- a/src/glx/clientinfo.c
+++ b/src/glx/clientinfo.c
@@ -123,6 +123,10 @@ glxSendClientInfo(struct glx_display *glx_dpy, int screen)
    for (i = 0; i < ScreenCount(glx_dpy->dpy); i++) {
       struct glx_screen *src = glx_dpy->screens[i];
 
+      if (src == NULL) {
+          continue;
+      }
+
       const char *haystack = src->serverGLXexts;
       while (haystack != NULL) {
     char *match = strstr(haystack, "GLX_ARB_create_context");