From 755f2c5ca92944dcf33ed39cbcdd04a2ce6b9481 Mon Sep 17 00:00:00 2001 From: Zhu Yuliang Date: Wed, 28 Jul 2021 11:27:27 +0800 Subject: [PATCH] gallium/vl: don't leak fd in vl_dri3_screen_create Reviewed-by: Pierre-Eric Pelloux-Prayer Cc: mesa-stable Part-of: (cherry picked from commit b88fd3ccc0deeb3776ed4fd0c72b4ab649e1a208) --- .pick_status.json | 2 +- src/gallium/auxiliary/vl/vl_winsys_dri3.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 824a208e71e..9bd499507cc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2029,7 +2029,7 @@ "description": "gallium/vl: don't leak fd in vl_dri3_screen_create", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c index 1866dbc413e..f2dd810b438 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c @@ -847,6 +847,9 @@ vl_dri3_screen_create(Display *display, int screen) scrn->base.set_back_texture_from_output = vl_dri3_screen_set_back_texture_from_output; scrn->next_back = 1; + + close(fd); + return &scrn->base; no_context: