From c6d2afccc87bf007fa60eddf69555148dffa0bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Thu, 26 Jan 2023 13:25:57 +0100 Subject: [PATCH] kopper: Do not free the given screen in initScreen implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The given screen is already freed by the caller in case a NULL-pointer is returned by the implementation. Cc: mesa-stable Signed-off-by: Corentin Noël Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit dd3730f8bdd7afdbc7fb0e9dd200951f9d713a34) --- .pick_status.json | 2 +- src/gallium/frontends/dri/kopper.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 1edc62c7d26..65981e2a1f3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5107,7 +5107,7 @@ "description": "kopper: Do not free the given screen in initScreen implementation", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c index 0102e2cf477..5268f1fb9fb 100644 --- a/src/gallium/frontends/dri/kopper.c +++ b/src/gallium/frontends/dri/kopper.c @@ -194,7 +194,6 @@ fail: dri_destroy_screen_helper(screen); if (screen->dev) pipe_loader_release(&screen->dev, 1); - FREE(screen); return NULL; }