From 757709dc878b421003b79189fb546b985854c7bb Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 27 Sep 2023 14:43:09 -0400
Subject: [PATCH] glx: XFree visual info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cc: mesa-stable

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25441>
(cherry picked from commit 441e57048b4e0b09effad202ba4a5c8f8b08131a)
---
 .pick_status.json                        | 2 +-
 src/gallium/frontends/glx/xlib/glx_api.c | 2 +-
 src/glx/glxcmds.c                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 76a7df3e5d1..776f90682bf 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -364,7 +364,7 @@
         "description": "glx: XFree visual info",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c
index 63163a8c523..556a878c648 100644
--- a/src/gallium/frontends/glx/xlib/glx_api.c
+++ b/src/gallium/frontends/glx/xlib/glx_api.c
@@ -423,7 +423,7 @@ get_visual( Display *dpy, int scr, unsigned int depth, int xclass )
          return vis;
       }
       else {
-         free((void *) vis);
+         XFree((void *) vis);
          return NULL;
       }
    }
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index 91c4c627bfe..9b64cd8a3b3 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -1108,7 +1108,7 @@ glXChooseVisual(Display * dpy, int screen, int *attribList)
                                   &visualTemplate, &i);
 
          if (newList) {
-            free(visualList);
+            XFree(visualList);
             visualList = newList;
             best_config = config;
          }