From 0ee24d08fa2bbf01434c3b00593155302c171f59 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 17 Nov 2020 16:37:41 -0800 Subject: [PATCH] gallium: Fix leak of the merged driconf options. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 8a05d6ffc65d ("driconf: Make the driver's declarations be structs instead of XML.") Reviewed-by: Rob Clark Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 0626e3a950d5dbe5d86244670b54b67a2af6014c) --- .pick_status.json | 2 +- src/gallium/auxiliary/pipe-loader/pipe_loader.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 0274e40bd66..b8bf26af205 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -67,7 +67,7 @@ "description": "gallium: Fix leak of the merged driconf options.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "8a05d6ffc65d0fd0e0a52fe84a174d4ca63e5521" }, diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c index 29b4993257b..10638a39ed7 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c @@ -120,6 +120,7 @@ pipe_loader_load_options(struct pipe_loader_device *dev) driParseOptionInfo(&dev->option_info, merged_driconf, merged_count); driParseConfigFiles(&dev->option_cache, &dev->option_info, 0, dev->driver_name, NULL, NULL, 0, NULL, 0); + free((void *)merged_driconf); } char *