From 28f746569c05f817ae895f2fcbc3ee42e02135a2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 21 Jul 2025 15:18:36 -0400 Subject: [PATCH] egl/x11: don't leak device_name when choosing zink MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cc: mesa-stable Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 3951125f98d4c6a3eaf0beb9fbefc2b7f54a86fd) --- .pick_status.json | 2 +- src/egl/drivers/dri2/platform_x11.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6d63021d554..011ce1e7d98 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3714,7 +3714,7 @@ "description": "egl/x11: don't leak device_name when choosing zink", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 14335e0b504..f2965c21065 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1781,8 +1781,10 @@ platform_x11_finalize(_EGLDisplay *disp) if (!dri2_dpy->swrast) { #ifdef HAVE_WAYLAND_PLATFORM - if (dri2_dpy->kopper) + if (dri2_dpy->kopper) { + free(dri2_dpy->device_name); dri2_dpy->device_name = strdup("zink"); + } #endif dri2_dpy->swap_available = true;