From 27c09eacb7d6654e807f64549e57f0fd6a34e0b3 Mon Sep 17 00:00:00 2001
From: Sid Pranjale <mail@sidonthe.net>
Date: Sat, 7 Sep 2024 10:34:11 +0530
Subject: [PATCH] glx: add a missing nullptr check

This caused GLX applications to segfault under zink.
This technically also fixes cleanup when any driver fails init

Signed-off-by: Sid Pranjale <mail@sidonthe.net>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31072>
---
 src/glx/glxext.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index d7bc484b7d7..ccf9b6cd564 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -739,7 +739,10 @@ glx_screen_cleanup(struct glx_screen *psc)
       psc->visuals = NULL;   /* NOTE: just for paranoia */
    }
 #if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE))
-   driDestroyConfigs(psc->driver_configs);
+   if (psc->driver_configs) {
+      driDestroyConfigs(psc->driver_configs);
+      psc->driver_configs = NULL;
+   }
    /* Free the direct rendering per screen data */
    driDestroyScreen(psc->frontend_screen);
 #endif